Merge tag 'mac80211-for-davem-2015-02-27' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Sun, 1 Mar 2015 04:33:53 +0000 (23:33 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Mar 2015 04:33:53 +0000 (23:33 -0500)
Johannes Berg says:

====================
A few patches have accumulated, among them the fix for Linus's
four-way-handshake problem. The others are various small fixes
for problems all over, nothing really stands out.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge