| commit | 85c21049fc588e0a51b443fe2bad348d18f4992c | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Aug 24 15:18:03 2012 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Fri Aug 24 15:18:07 2012 -0400 |
| tree | 66d800593c25b6be792969152e2dd1fb64581206 | |
| parent | 2c33bb37cb69dc6d86d2ee8edd1d4814990a65fe [diff] | |
| parent | f20b6213f193f455a62ef9299ceca11f5531dff8 [diff] |
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>