path: root/net/sched/sch_htb.c
diff options
authorDavid S. Miller <davem@davemloft.net>2013-02-12 16:11:09 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-12 16:11:09 -0500
commit37d51101ec27f1cc3ff089993ded29849adc7037 (patch)
tree5048db30bd4db62fc805a1972c73259614ca9346 /net/sched/sch_htb.c
parent96be80abaf95d01aa623246048b422cbcb6b8baf (diff)
parent318d86dbe55cbc63a61a83b9ff6cdbc044905f5e (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== Here is another handful of late-breaking fixes intended for the 3.8 stream... Hopefully the will still make it! :-) There are three mac80211 fixes pulled from Johannes: "Here are three fixes still for the 3.8 stream, the fix from Cong Ding for the bad sizeof (Stephen Hemminger had pointed it out before but I'd promptly forgotten), a mac80211 managed-mode channel context usage fix where a downgrade would never stop until reaching non-HT and a bug in the channel determination that could cause invalid channels like HT40+ on channel 11 to be used." Also included is a mwl8k fix that avoids an oops when using mwl8k devices that only support the 5 GHz band. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
0 files changed, 0 insertions, 0 deletions