Merge tag 'android-msm-flo-3.4-kitkat-mr2' into HEAD

Conflicts:
	arch/arm/configs/flo_defconfig
	drivers/power/bq27541_battery.c
	drivers/staging/android/ashmem.c
	include/net/tcp.h
	net/wireless/reg.c
Merge tag 'android-msm-mako-3.4-kitkat-mr2' into HEAD

Conflicts:
	arch/arm/configs/mako_defconfig