Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Mon, 21 Dec 2009 19:54:49 +0000 (11:54 -0800)]
1  2 
drivers/net/Kconfig
drivers/net/wireless/iwmc3200wifi/rx.c

Simple merge