Linux 3.4.93

Conflicts:
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
	net/bluetooth/l2cap_core.c