Merge remote-tracking branch 'korg/linux-3.4.y' into cm-10.2

Conflicts:
	kernel/futex.c
	kernel/workqueue.c

Change-Id: Ib0680303390e8928d3327df4d714cb56d61f9d22
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
sec_battery: fix ifdefs

Change-Id: I0747dbbcc7607fafd19d9658d6acd38ed1b84d92
Merge pull request #1 from CyanogenMod/cm-10.2

bring in upstream