diff options
author | David S. Miller <davem@davemloft.net> | 2012-04-18 21:26:52 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-18 21:26:52 +0200 |
commit | 56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47 (patch) | |
tree | cb367e928baae532e552dd285700a9fb1f290391 /arch/x86 | |
parent | netns: do not leak net_generic data on failed init (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
download | linux-56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47.tar.xz linux-56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
From John:
Another batch of fixes intended for 3.4...
First up, we have a minor signedness fix for libertas from Amitkumar
Karwar. Next, Arend gives us a brcm80211 fix for correctly enabling
Tx FIFOs on channels 12 and 13. Bing Zhao gives us some register
address corrections for mwifiex. Felix give us a trio of fixes --
one for ath9k to wake the hardware properly from full sleep, one for
mac80211 to properly handle packets in cooked monitor mode, and one
for ensuring that the proper HT mode selection is honored.
Hauke gives us a bcma fix for handling the lack of an sprom. Jonathon
Bither gives us an ath5k fix for a missing THIS_MODULE build issue,
and another ath5k fix for an io mapping leak. Lukasz Kucharczyk
fixes a bitwise check in cfg80211, and Sujith gives us an ath9k fix
for assigning sequence numbers for fragmented frames. Finally, we
have a MAINTAINERS change from Wey-Yi Guy -- congrats to Johannes
Berg for taking the lead on iwlwifi. :-)
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions