Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

author Johan Hedberg <[email protected]>

Thu, 16 Feb 2012 12:23:04 +0000 (14:23 +0200)

committer Johan Hedberg <[email protected]>

Thu, 16 Feb 2012 12:25:34 +0000 (14:25 +0200)
author Johan Hedberg <[email protected]>
Thu, 16 Feb 2012 12:23:04 +0000 (14:23 +0200)
committer Johan Hedberg <[email protected]>
Thu, 16 Feb 2012 12:25:34 +0000 (14:25 +0200)
diff --cc drivers/bluetooth/btusb.c
Simple merge
diff --cc drivers/bluetooth/hci_bcsp.c
Simple merge
diff --cc drivers/bluetooth/hci_ldisc.c
Simple merge
author	Johan Hedberg <[email protected]>
	Thu, 16 Feb 2012 12:23:04 +0000 (14:23 +0200)
committer	Johan Hedberg <[email protected]>
	Thu, 16 Feb 2012 12:25:34 +0000 (14:25 +0200)
		1	2
drivers/bluetooth/btusb.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_bcsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/hci_ldisc.c	patch \|	diff1 \|	diff2 \|	blob \| history