Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into...
John W. Linville [Fri, 27 May 2011 19:18:35 +0000 (15:18 -0400)]
1  2 
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/rc.c

Simple merge
Simple merge