Merge tag 'master-2014-10-30' of git://

John W. Linville says:

pull request: wireless 2014-10-31

Please pull this small batch of spooky fixes intended for the 3.18!

Cyril Brulebois adds an rt2x00 device ID.

Dan Carpenter provides a one-line masking fix for an ath9k debugfs

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 <>