Merge remote-tracking branch 'aosp/android-msm-mako-3.4-kitkat-mr2' into HEAD

Conflicts:
	arch/arm/lib/memset.S
	drivers/staging/prima/CORE/SME/src/csr/csrApiScan.c
	include/net/tcp.h
	net/wireless/reg.c

Change-Id: Ib9fd5d5908fd85b69098596d97bca21faa7d1b69
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
mako update defconfig and bump version

Change-Id: I8197d141ecbac0f41f2cc3e82024c2d5547787ac

Conflicts:
	arch/arm/configs/crom_mako_defconfig