commit b67afe7f43afd2f5cd98798993561920c1684c12
author John W. Linville <linville@tuxdriver.com> Fri Feb 18 17:03:41 2011 -0500
committer John W. Linville <linville@tuxdriver.com> Fri Feb 18 17:03:41 2011 -0500
tree e45a0e41c91a1d199fd865b011ed0d25f5497bb9
parent db28569adc692d9fb8a2d2d8e7ebab7fd5481f10
parent 28bec7b845e10b68e6ba1ade5de0fc566690fc61

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

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

drivers/bluetooth/ath3k.c

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index e6acaba..5577ed6 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -69,6 +69,9 @@
 	/* Atheros AR3012 with sflash firmware*/
 	{ USB_DEVICE(0x0CF3, 0x3004) },
 
+	/* Atheros AR5BBU12 with sflash firmware */
+	{ USB_DEVICE(0x0489, 0xE02C) },
+
 	{ }	/* Terminating entry */
 };