From: David S. Miller Date: Fri, 31 Oct 2014 20:18:35 +0000 (-0400) Subject: Merge tag 'master-2014-10-30' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... X-Git-Tag: v3.18-rc3~17^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=99a49ce613057f1934e1c378808374fd683b1541;p=~emulex%2Finfiniband.git 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 --- 99a49ce613057f1934e1c378808374fd683b1541