diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-14 22:50:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-14 22:50:25 -0400 |
| commit | ee7d07e7940c73dc004a9e22e9c3b34b7a9d810e (patch) | |
| tree | 6e1b40837d7c882c89f6550fae162ddca091f467 /drivers/net/Kconfig | |
| parent | 32fc3fd41ae44a41ffb8fd5ec4f4764822104655 (diff) | |
| parent | 8c35743fdc3c013cbb9832dc9c5eb04362b86cbb (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
Please pull these last(?) few wireless bits intended for the 3.14
stream. Each is here to address a problem found with a patch already
merged...
Dave Jones gives us a memory leak fix, for an error path in brcmfmac.
Felix Fietkau moves a small delay to make it actually reachable.
Helmut Schaa fixes an ath9k sequence numbering problem for non-data
frames.
Stanislaw Gruszka reverts an earlier fix that was found to cause
random connection drops on RT5390 PCI adapters
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Kconfig')
0 files changed, 0 insertions, 0 deletions