diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-10 16:59:40 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-10 16:59:40 +0100 |
| commit | 235f93922878234f3d99a4205ebe3634ee955919 (patch) | |
| tree | 1c61b53899e26839941e46d9f6e4bba28ddd23b5 /lib | |
| parent | xen-netback: stop vif thread spinning if frontend is unresponsive (diff) | |
| parent | ath9k: Disable cross-band FCC (diff) | |
| download | linux-235f93922878234f3d99a4205ebe3634ee955919.tar.xz linux-235f93922878234f3d99a4205ebe3634ee955919.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
net/ieee802154/6lowpan.c
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions