Merge tag 'mac80211-for-john-2014-09-08' of git://git.kernel.org/pub/scm/linux/kernel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Sep 2014 18:29:36 +0000 (14:29 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 9 Sep 2014 18:29:36 +0000 (14:29 -0400)
commitab09b95cbfecc3c9dd45268176f6fd13beb75bcb
tree4e251dcb8e4e632d113f998abe0cb2405f3e5e1b
parent1bd3fa7b8c9b2936c16c6e6452f9cc991c405872
parent785e21a89d77923852869f83ebd2689ec4d5ce54
Merge tag 'mac80211-for-john-2014-09-08' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg <johannes@sipsolutions.net> says:

"Two more fixes for mac80211 - one of them addresses a long-standing
issue that we only found when using vendor events more frequently;
the other addresses some bad information being reported in userspace
that people were starting to actually look at."

Signed-off-by: John W. Linville <linville@tuxdriver.com>