diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-24 21:18:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-24 21:18:07 +0200 |
| commit | 85c21049fc588e0a51b443fe2bad348d18f4992c (patch) | |
| tree | 66d800593c25b6be792969152e2dd1fb64581206 /net/key | |
| parent | team: do not allow to add VLAN challenged port when vlan is used (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-85c21049fc588e0a51b443fe2bad348d18f4992c.tar.xz linux-85c21049fc588e0a51b443fe2bad348d18f4992c.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This is a batch of updates intended for 3.7. The bulk of it is
mac80211 changes, including some mesh work from Thomas Pederson and
some multi-channel work from Johannes. A variety of driver updates
and other bits are scattered in there as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions