summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-11-26 16:38:35 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-26 16:38:35 -0500
commitd1c637c51d87e021c12ed66baddf6cfbd11a3e2b (patch)
tree230fa979dd666ab491155f9c3f49230e820d4fc0 /include
parentf4713a3dfad045d46afcb9c2a7d0bba288920ed4 (diff)
parent7d63a5f9b25ba6b130da8eb2d32a72b1462d0249 (diff)
Merge tag 'master-2014-11-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== pull request: wireless 2014-11-26 Please pull this little batch of fixes intended for the 3.18 stream... For the iwlwifi one, Emmanuel says: "Not all the firmware know how to handle the HOT_SPOT_CMD. Make sure that the firmware will know this command before sending it. This avoids a firmware crash." Along with that, Larry sends a pair of rtlwifi fixes to address some discrepancies from moving drivers out of staging. Larry says: "These two patches are needed to fix a regression introduced when driver rtl8821ae was moved from staging to the regular wireless tree." 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