diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-20 01:37:15 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-20 01:37:15 +0400 |
| commit | a77f4b4acf5b77f038bc11d3ca9b3af6f0124015 (patch) | |
| tree | 167fc01ea7be7474b7e59173f638a9b25845fbf2 /include/linux/if_team.h | |
| parent | 364f5b3a151942ad24521155355cc7d1d252fd55 (diff) | |
| parent | b3c911eeb47d08aada986f769b6a060794dfe9d0 (diff) | |
| download | linux-a77f4b4acf5b77f038bc11d3ca9b3af6f0124015.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John Linville says:
====================
This is a sizeable batch of updates intended for 3.6...
The bulk of the changes here are Bluetooth. Gustavo says:
Here goes the first Bluetooth pull request for 3.6, we have
queued quite a lot of work. Andrei Emeltchenko added the AMP
Manager code, a lot of work is needed, but the first bit are
already there. This code is disabled by default. Mat Martineau
changed the whole L2CAP ERTM state machine code, replacing
the old one with a new implementation. Besides that we had
lot of coding style fixes (to follow net rules), more l2cap
core separation from socket and many clean ups and fixed all
over the tree.
Along with the above, there is a healthy dose of ath9k, iwlwifi,
and other driver updates. There is also another pull from the
wireless tree to resolve some merge issues. I also fixed-up some
merge discrepencies between net-next and wireless-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_team.h')
0 files changed, 0 insertions, 0 deletions