diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-07-31 21:11:50 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-31 21:11:50 +0200 |
| commit | 704278ccb5c9fcbe09d1be3657950c17fad18ba8 (patch) | |
| tree | 1e15c5196541b928f076ae8d50e56a4cf9fbe7b8 /net/mac80211/rc80211_minstrel_ht.c | |
| parent | MAINTAINERS: change email of TI WiLink drivers' maintainer (diff) | |
| parent | Bluetooth: Fix calling request callback more than once (diff) | |
| download | linux-704278ccb5c9fcbe09d1be3657950c17fad18ba8.tar.xz linux-704278ccb5c9fcbe09d1be3657950c17fad18ba8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Conflicts:
net/bluetooth/hci_core.c
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.c')
0 files changed, 0 insertions, 0 deletions