Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Fri, 10 Jun 2011 18:26:12 +0000 (14:26 -0400)]
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c

1  2 
drivers/net/wireless/iwlegacy/iwl-4965.c
drivers/net/wireless/rtlwifi/pci.c
net/wireless/nl80211.c

Simple merge
Simple merge