Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jul 2011 21:05:55 +0000 (17:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 26 Jul 2011 21:05:55 +0000 (17:05 -0400)
commite5036c2575b244851637a81efc4104c076c4fa21
tree5d8d5dd0a768b77bda3299ea565c7444c26ed6f1
parent41bf37117b47fc5ce2aae91f6a108e7e42e0b046
parent5bc91db8933bce07c3af86da2bd956414aa5a725
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem
drivers/net/wireless/b43/main.c