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

Change-Id: Idd0b37d5b414e659e131b98cbd73b7ea4cff4899

Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako.c
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h