Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 24 Nov 2010 21:49:20 +0000 (16:49 -0500)]
1  2 
drivers/net/wireless/rt2x00/Kconfig

Simple merge