Merge branch 'cm-10.1' of https://github.com/CyanogenMod/android_kernel_samsung_msm8660-common into jellybean2

Conflicts:
	drivers/misc/a2220.c

'Merge'