aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/atheros
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-03-14 22:50:25 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-14 22:50:25 -0400
commitee7d07e7940c73dc004a9e22e9c3b34b7a9d810e (patch)
tree6e1b40837d7c882c89f6550fae162ddca091f467 /drivers/net/ethernet/atheros
parentnet: phy: fix uninitalized ethtool_wolinfo in phy_suspend (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (diff)
downloadlinux-dev-ee7d07e7940c73dc004a9e22e9c3b34b7a9d810e.tar.xz
linux-dev-ee7d07e7940c73dc004a9e22e9c3b34b7a9d810e.zip
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/ethernet/atheros')
0 files changed, 0 insertions, 0 deletions