| commit | b67afe7f43afd2f5cd98798993561920c1684c12 | [log] [tgz] |
|---|---|---|
| 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 [diff] | |
| parent | 28bec7b845e10b68e6ba1ade5de0fc566690fc61 [diff] |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c