Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Tue, 15 Mar 2011 18:16:48 +0000 (14:16 -0400)]
1  2 
drivers/net/wireless/ath/ath9k/mac.c
drivers/net/wireless/iwlwifi/iwl-agn.c

Simple merge