M2: add d2vzw support
M2_SPR: gpio_keys: compile gpio_keys_sec; Home/Vol Up/Down rocker should work
M2: add vibrator
M2: sound/*/codecs/wcd*: some fixups to match msm8960-d2
M2: sound: add trigger for msm_dai_q6_i2s_rx/tx_dai
M2: sound: regulator: make more regulators easily accessible; board_m2*: increase audio ion heap
M2: sound: add debugging prints
M2: Audience a2220 (Nothing newer than (c) 2009 HTC?)
M2_VZW: update defconfig - enable usb
M2: fwd-port our old bcmdhd drivers and fixup board files to make them work.

Conflicts:
	arch/arm/mach-msm/board-8960.h