Merge remote-tracking branch 'caf/jb_2.6' into cm-10.2

Tag: AU_LINUX_ANDROID_JB_2.6.04.03.00.109.048

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/assembler.h
	arch/arm/include/asm/uaccess.h
	arch/arm/lib/getuser.S
	arch/arm/lib/putuser.S
	arch/arm/mach-msm/Makefile
	drivers/gpu/msm/kgsl_sharedmem.c
	include/linux/mfd/pm8xxx/pm8921-charger.h

Change-Id: I815283c023562d1dbbcf22275fff0d1b9ebbf6e3