Revert "msm_serial_hs: sync with caf"

I dont feel like dealing with this huge wakelock so this is my way around it

This reverts commit 0a8f547b969644ad92c776016614f1773917ad1f.
d2: update bluetooth to latest d2 source drop (i535's ML1)

board-bluetooth-bcm4334's change is arbitrary, but w/e

Change-Id: I48a57b0070148db7946a264fb485850b95cf4944
Revert "Revert "msm_serial_hs: sync with caf""

Bluetooth test, better not fuck up deep sleep blek or I will kill your kat

This reverts commit 1a571643c75b1aa42f2e3a1337d96f4cda3fc420.
bcmdhd: filter multicast during sleep

Change-Id: I0e56dbd579c44157fb26c34c1de078b62cbe07ec
Revert "Revert "Revert "msm_serial_hs: sync with caf"""

I am killing your fucking cat Dan

This reverts commit 8a2b0ebd0bb45884421d03808b0e6270fe154d50.
Revert "Revert "Revert "Revert "msm_serial_hs: sync with caf""""

I guess your cat will live

This reverts commit 68fe0f1dee05bd238c272d0de6e311de3bc7f983.
Revert "d2: add support for variant defconfigs"

This reverts commit c620048d9452187ba48a39892f0711f249dadf50.

Conflicts:
	scripts/kconfig/conf.c

Change-Id: I7880c33bb166bff3175292bc29c108fb96d256f8
d2: commonize everything

* defconfigs
* board files
* all other references to CONFIG_MACH_M2_*
* use VZW as the preferred option
* remove CONFIG_MSM_BAM_DMUX_NOLOCK and set it as default for M2

Change-Id: I47bc15a2782ae6bad72a4ac8e1f4b6a100b64739

Conflicts:
	arch/arm/configs/cyanogen_apexq_defconfig
	arch/arm/configs/cyanogen_expressatt_defconfig
	arch/arm/mach-msm/board-m2_att-gpiomux.c
	arch/arm/mach-msm/board-m2_spr-gpiomux.c
Revert "Revert "Revert "Revert "Revert "msm_serial_hs: sync with caf"""""

This reverts commit b53c7e176695d982ff08965de10f5bbcf304175a.
Revert "d2: update bluetooth to latest d2 source drop (i535's ML1)"

This reverts commit 2fc4c9fd57ba7059bf5b9d9e60d353d1a448200e.