]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c3a667 87dd634)
Merge tag 'iwlwifi-for-john-2014-11-10' of git://git.kernel.org/pub/scm/linux/kernel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Nov 2014 21:10:19 +0000 (16:10 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Nov 2014 21:10:19 +0000 (16:10 -0500)
commit9d828ad7d3c791d45a2eb1c6c683bd86ba04713b
tree874f48aaf062681f273ba79cd116946edfcb83bbtree | snapshot
parent9c3a6670863033df421c8e46f79f383cf3a922eecommit | diff
parent87dd634ae72bb8f6d0dd12f1cbbc67c7da6dba3bcommit | diff
Merge tag 'iwlwifi-for-john-2014-11-10' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes

Emmanuel Grumbach <egrumbach@gmail.com> says:

"Two fixes here - we weren't updating mac80211 if a scan
was cut short by RFKILL which confused cfg80211. As a
result, the latter wouldn't allow to run another scan.
Liad fixes a small bug in the firmware dump."

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Michael's Linux tree.