Merge tag 'mac80211-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 May 2015 20:44:25 +0000 (16:44 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 May 2015 20:44:25 +0000 (16:44 -0400)
Johannes Berg says:

====================
This has just a single fix, for a WEP tailroom check
problem that leads to dropped frames.
====================

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

Trivial merge