diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-14 20:23:33 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-14 20:23:33 +0100 |
| commit | b90af3b8c69730fb25646c04866dfccec2f1314b (patch) | |
| tree | fb4a7dd23f5d8b7803d89f1e3fb1ab075f1c06a0 /virt | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
| parent | mwl8k: fix band for supported channels (diff) | |
| download | linux-b90af3b8c69730fb25646c04866dfccec2f1314b.tar.xz linux-b90af3b8c69730fb25646c04866dfccec2f1314b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/iwlwifi/dvm/tx.c
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions