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

Conflicts:
	net/wireless/reg.c

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

Conflicts:
	drivers/gpio/gpio-msm-v2.c

Change-Id: I0ff9d479bd36cceff1055ca028ae132f0786879d
d2: update m2selinux_defconfig

Change-Id: Ie118d22e25b8a4b5d59750c273ac007be12542e7
Do not reset bam hardware when A2 goes into pc

This removes the functional component of
a82a95c209207c4f7721971785863e90603b93f2
Prevent bootloops on gsm phones