summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-10-31 16:18:35 -0400
committerDavid S. Miller <davem@davemloft.net>2014-10-31 16:18:35 -0400
commit99a49ce613057f1934e1c378808374fd683b1541 (patch)
tree22366b2ed170e9e8c82fd3133457ab7834a15139 /include
parent1e5c4bc497c0a96e1ad2974539d353870f2cb0b6 (diff)
parent75a916e1944fea8347d2245c62567187e4eff9dd (diff)
Merge tag 'master-2014-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== pull request: wireless 2014-10-31 Please pull this small batch of spooky fixes intended for the 3.18 stream...boo! Cyril Brulebois adds an rt2x00 device ID. Dan Carpenter provides a one-line masking fix for an ath9k debugfs entry. Larry Finger gives us a package of small rtlwifi fixes which add some bits that were left out of some feature updates that were included in the merge window. Hopefully this isn't a sign that the rtlwifi base is getting too big... Marc Yang brings a fix for a temporary mwifiex stall when doing 11n RX reordering. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions