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

Conflicts:
	drivers/staging/android/lowmemorykiller.c
	drivers/video/msm/lcdc_ld9040.c

'Merge'