Merge tag 'mac80211-for-davem-2015-01-23' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 01:32:24 +0000 (17:32 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Jan 2015 01:32:24 +0000 (17:32 -0800)
commit7d63585bf0a6c99382f97a5af71c5b5547fb58a4
treeb9e69e379e8f664a7715191da2472f16fa8f7c41
parentdf4d92549f23e1c037e83323aff58a21b3de7fe0
parent0fa7b39131576dd1baa6ca17fca53c65d7f62249
Merge tag 'mac80211-for-davem-2015-01-23' of git://git./linux/kernel/git/jberg/mac80211

Another set of last-minute fixes:
 * fix station double-removal when suspending while associating
 * fix the HT (802.11n) header length calculation
 * fix the CCK radiotap flag used for monitoring, a pretty
   old regression but a simple one-liner
 * fix per-station group-key handling

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