Merge branch 'android-msm-mako-3.4-kitkat-mr1' of https://android.googlesource.com/kernel/msm into cm-11.0

Conflicts:
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/mercury/msm_mercury_hw.c
	drivers/media/video/msm/mercury/msm_mercury_hw.h
	drivers/media/video/msm/mercury/msm_mercury_sync.c
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h

Change-Id: I6c71e6a9ae7f281245069b22b6d2746b122aaf75