diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-08 16:39:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-08 16:39:55 -0400 |
| commit | 0f27f575f9e0d9eb43247da5d90a0f93574a0790 (patch) | |
| tree | 59faf25665e51414479b138a3c2e3bc8b388a9ed /fs/proc/array.c | |
| parent | b50b72de2f2feed4adfbd8e18610a393b5a04cc7 (diff) | |
| parent | 64e5751918b4d03015b185750a46ecd050e1ce77 (diff) | |
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 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions