Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'Cyanogen/cm-10.2'
Merge branch 'cm-10.2' of github.com:Hellybean/android_vendor_cm into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2

Conflicts:
	config/common.mk

Change-Id: I94c253ac05adbbe20f0f0099285b1dd465777fc7
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
vendor/cm: Clean up init.local.rc

These changes fix the error below found in a logcat and clean up some other issues in the file.

"E CM PowerHAL: Error opening /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate: Permission denied"

	PS2: tweaked permissions & removed dupilcated entries

Change-Id: I9b1bbe66c36ba0d8de13b8cb9351d2952851c250
keys: Updated path for the signing makefile

Change-Id: I0b293829539682a8fc3b4b672f488b5c53f81282
Merge "vendor/cm: Clean up init.local.rc" into cm-10.2
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
init.local.rc: Fix typo

Change-Id: Iec9b4c84cfc8c594558cab55a597cbefa6171d33
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_vendor_cm into cm-10.2
testing: ifdef stuff for ThdDude
needs setting in devicetree, in BoardConfig.mk: ThdDude := true

Change-Id: I424bb199a4339da9ee31f68cb53a67f89df5256e
Merge branch 'origin/cm-10.2'

Conflicts:
	config/common.mk