msm_serial_hs: sync with caf

Change-Id: Ie44043dc00c0ee1fc7c87c3175542961d580742d
Merge remote-tracking branch 'korg/linux-3.4.y' into cm-11.0

Conflicts:
	arch/arm/kernel/traps.c
	drivers/gpio/gpio-msm-v2.c

Change-Id: Ia96ac7c37b6e01d3fd97a2352ef05fb7e245abc6
gcc-wrapper: force python version 2

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