Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
David S. Miller [Tue, 11 May 2010 05:53:41 +0000 (22:53 -0700)]
1  2 
drivers/net/wireless/ath/ar9170/usb.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
net/mac80211/mlme.c

Simple merge
Simple merge