diff options
author | David S. Miller <davem@davemloft.net> | 2013-07-20 17:01:40 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-07-20 17:01:40 -0700 |
commit | f5f7ab6785ec15b8b95750c0dd590ca3aeb49248 (patch) | |
tree | a8d735c3d786cab13d703e33a28805e51f84de45 /net | |
parent | 8d716c7a09e0db7458dc072dd518c991c922931f (diff) | |
parent | 876fbb5d3ebab01685fef3839d245481c30eab5f (diff) |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
Please accept this batch of fixes intended for the 3.11 tree...
Alexey Khoroshilov fixes a suspend-related race in ath9k_htc.
Arnd Bergmann corrects the alignment of a structure in the ssb code
to be compatible with ARM devices.
Bob Copeland provides an ath5k fix that corrects a mistaken variable
initialization.
Felix Fietkau corrects some frame accounting for dropped frames
in ath9k.
Geert Uytterhoeven brings a Kconfig fix to indicate the DMA
requirements for rt2x00.
Larry Finger offers two rtlwifi fixes: one that properly initializes
a callback; and, a scattered collection of Kconfig, Makefile, and
EXPORT_SYMBOL changes that correct some build problems.
Finally, Sujith Manoharan provides an ath9k fix to disable a feature
on a specific hardware device.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions