Squashed merge remote-tracking branch 'codeaurora/kk_2.7_rb1.9' into kk-bringup
Conflicts:
	arch/arm/configs/ville_defconfig
	arch/arm/kernel/perf_event.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/htc/htc_battery_8960.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/leds/leds-pm8xxx-htc.c
	mm/Kconfig
	sound/soc/codecs/wcd9304.c
Squashed merge codeaurora/kk_2.7_rb1.10
Conflicts:
	arch/arm/configs/ville_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/htc/htc_battery_8960.c
	drivers/gpu/msm/adreno.c
	drivers/leds/leds-pm8xxx-htc.c
	drivers/tty/serial/msm_serial_hs.c
	include/linux/fastchg.h
	mm/Kconfig