Learn more about cloning repositories
You have read-only access
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c
