]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorDavid S. Miller <davem@davemloft.net>
Mon, 17 Sep 2012 04:57:32 +0000 (00:57 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Sep 2012 04:57:32 +0000 (00:57 -0400)
commitba01dfe18241bf89b058fd8a60218b218ad2bb30
tree3fabfae4ae740e335c545c8967542f61ed4fd750
parente97563989a609296c3cbf5b6d8c8dc0a3e47b00b
parent9316f0e3c6ba524d8fa14bfded048b252891931a
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
This is another batch of updates intended for the 3.7 stream.

There are not a lot of large items, but iwlwifi, mwifiex, rt2x00,
ath9k, and brcmfmac all get some attention.  Wei Yongjun also provides
a series of small maintenance fixes.

This also includes a pull of the wireless tree in order to satisfy
some prerequisites for later patches.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>