Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.37' into cm-11.0

Conflicts:
	arch/arm/mm/dma-mapping.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	net/wireless/nl80211.c

Change-Id: I4228f28bc74631aba13e1da969c91aaefc463195
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0