Merge branch 'cm-10.2' of github.com:CyanogenMod/android into cm-10.2
update default.xml

Change-Id: I2235b46ea73a2d5559ef391a99ee0a8ee9353fa5
Merge branch 'cm-10.2' of github.com:Hellybean/android into cm-10.2
switched some repos to point to linaro

Change-Id: I022cf77e2af7d37a535112e147b050d1530668f0
added mako muppets repo

Change-Id: I8ac565403a6029c980b7038f20bc3fc9b9990a3e
Added Diablo Kernel
place Cl3Kener's Linaro kernel TC where all the others are

Change-Id: I0d94643612df38c63833ade502cbb689f3544ad8
removed crespo kernel from manifest

Change-Id: I07ca92acc2b3eb84626ee383692ddccaa30364ab
Update default.xml
system/vold from hellybean

Change-Id: I11edc8884759dd4c976b44d746303ec5f2c4bd85
Merge branch 'cm-10.2' of github.com:Hellybean/android into cm-10.2
Revert "Update default.xml"

This reverts commit 39e5626b54882006b35915df16eedb6e6baab7a8.
hardware/qcom/display-caf from Hellybean
Fix Derp

Too many slashes!
track system/core from hellybean

Change-Id: I3af8cb75db0d220e81ac6a073780bfdde53f08ec
Merge branch 'cm-10.2' of github.com:Hellybean/android into cm-10.2
Merge branch 'origin/cm-10.2'

Conflicts:
	default.xml