John W. Linville b67afe7f43 Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c
2011-02-18 17:03:41 -05:00
..
2011-02-15 09:45:52 -03:00
2005-04-16 15:20:36 -07:00
2010-12-01 21:04:43 -02:00