From: David S. Miller Date: Tue, 19 May 2015 20:43:17 +0000 (-0400) Subject: Merge tag 'mac80211-next-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: Ubuntu-5.0.0-8.9~9199^2~256 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b7a3a8e31f6e74822939bbc5bd0e21f90eb319f9;p=mirror_ubuntu-disco-kernel.git Merge tag 'mac80211-next-for-davem-2015-05-19' of git://git.kernel.org/pub/scm/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 --- b7a3a8e31f6e74822939bbc5bd0e21f90eb319f9