Merge tag 'mac80211-next-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 May 2015 20:43:17 +0000 (16:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 May 2015 20:43:17 +0000 (16:43 -0400)
commitb7a3a8e31f6e74822939bbc5bd0e21f90eb319f9
tree2571cd6731602fbcf00dde1ec4466999859add2c
parent9a03259c3d30d4b1b582072211dc571a68340054
parent658358cec93a7130615cfc1d6843ab07e49625e6
Merge tag 'mac80211-next-for-davem-2015-05-19' of git://git./linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
This just has a few fixes:
 * LED throughput trigger was crashing
 * fast-xmit wasn't treating QoS changes in IBSS correctly
 * TDLS could use the wrong channel definition
 * using a reserved channel context could use the wrong channel width
====================

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