diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-12 14:23:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-12 14:23:41 -0700 |
| commit | 4a2e667ac15edd19b02321bc030acb3ebeb22ab6 (patch) | |
| tree | 29e0633559c8a72c152afaaaf797201c4de283fc /net/sched/sch_tbf.c | |
| parent | 8f728d7934c77f63e89abcc96b46a7a98416d5c1 (diff) | |
| parent | 3899ba90a4ab2f3cab8e0f91a76c14ff131c8293 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This pull request is intended for the 3.11 stream...
One big highlight is the cw1200 driver the ST-E CW1100 & CW1200
WLAN chipsets. This one has been lingering for a while, lacking
some review comments. Once started getting pulled into linux-next,
it got a bit more attention and a number of improvements were made
over the initial cut. No doubt there will be more changes ahead,
but I think it is looking alright at this point.
Along with that, there is the usual flurry of updates to the mac80211
core and the iwlwifi, mwifiex, ath9k, rt2x00, wil6210, and other
drivers. A few of the highlights are some rt2x00 refactoring/cleanup
by Gabor Juhos, some rt2800 hardware support enhancements by Stanislaw
Gruszka, some iwlwifi power management updates from Alexander Bondar,
some enhanced bcma SPROM support from Rafał Miłecki, and a variety
of other things here and there.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_tbf.c')
0 files changed, 0 insertions, 0 deletions