From: David S. Miller <davem@davemloft.net>
Date: Wed, 26 Nov 2014 21:38:35 +0000 (-0500)
Subject: Merge tag 'master-2014-11-25' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... 
X-Git-Tag: firefly_0821_release~176^2~2819^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d1c637c51d87e021c12ed66baddf6cfbd11a3e2b;p=firefly-linux-kernel-4.4.55.git

Merge tag 'master-2014-11-25' of git://git./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>
---

d1c637c51d87e021c12ed66baddf6cfbd11a3e2b