Merge remote-tracking branch 'google_msm/android-msm-mako-3.4-lollipop-release' into lollipop

Conflicts:
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c
	drivers/staging/prima/CORE/MAC/inc/qwlan_version.h
	drivers/staging/prima/CORE/SME/src/csr/csrNeighborRoam.c