diff options
| author | David S. Miller | 2013-04-08 22:39:55 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-04-08 22:39:55 +0200 |
| commit | 0f27f575f9e0d9eb43247da5d90a0f93574a0790 (patch) | |
| tree | 59faf25665e51414479b138a3c2e3bc8b388a9ed /drivers/net/bonding/bond_main.c | |
| parent | net: mvneta: enable features before registering the driver (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | kernel-qcow2-linux-0f27f575f9e0d9eb43247da5d90a0f93574a0790.tar.gz kernel-qcow2-linux-0f27f575f9e0d9eb43247da5d90a0f93574a0790.tar.xz kernel-qcow2-linux-0f27f575f9e0d9eb43247da5d90a0f93574a0790.zip | |
Merge branch 'wireless'
John W. Linville says:
====================
For the cfg80211 fix, Johannes says:
"I have another straggler for 3.9, adding locking forgotten in a previous
fix."
On top of that:
Bing Zhao provides an mwifiex fix to properly order a scan completion.
Franky Lin gives us a brcmfmac fix to fail at the firmware loading
stage if the nvram cannot be downloaded.
Gabor Juhos brings what at first looks like a rather big rt2x00 patch.
I think it is OK because it is really just reorganizing some code
within the rt2x00 driver in order to fix a build failure.
Hante Meuleman offers a trio of brcmfmac fixes related to running in
AP mode.
Robert Shade sends an ath9k fix to reenable interrupts even if a
channel change fails.
Tim Gardner gives us an rt2x00 fix to cut-down on some log SPAM.
Please let me know if there are problems!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
0 files changed, 0 insertions, 0 deletions