Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 19:18:03 +0000 (15:18 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 19:18:07 +0000 (15:18 -0400)
commit85c21049fc588e0a51b443fe2bad348d18f4992c
tree66d800593c25b6be792969152e2dd1fb64581206
parent2c33bb37cb69dc6d86d2ee8edd1d4814990a65fe
parentf20b6213f193f455a62ef9299ceca11f5531dff8
Merge branch 'for-davem' of git://git./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>