Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Wed, 10 Feb 2010 20:35:24 +0000 (12:35 -0800)]
1  2 
drivers/net/wireless/b43/main.c
drivers/net/wireless/iwmc3200wifi/rx.c

Simple merge