| commit | 211c17aaee644bb808fbdeef547ac99db92c01ed | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Wed Jun 13 15:35:35 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Wed Jun 13 15:35:35 2012 -0400 |
| tree | 2acf7fe32b30f537b06fed7e4c536ef0d11f2902 | |
| parent | ec8eb9ae5819da011ac574aa290207a2a47cdbae [diff] | |
| parent | bcb7ad7bcbef030e6ba71ede1f9866368aca7c99 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless Conflicts: drivers/net/wireless/ath/ath9k/main.c net/bluetooth/hci_event.c