Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for...
John W. Linville [Wed, 3 Aug 2011 13:18:21 +0000 (09:18 -0400)]
1  2 
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/rt2x00/rt2800lib.c

Simple merge