Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Tue, 26 Jul 2011 21:05:55 +0000 (17:05 -0400)]
1  2 
drivers/net/wireless/b43/main.c

Simple merge