Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Mon, 22 Aug 2011 18:28:50 +0000 (14:28 -0400)]
Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c

1  2 
drivers/net/wireless/ath/ath5k/base.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/libertas/main.c
drivers/net/wireless/libertas/mesh.c
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/rndis_wlan.c
net/mac80211/cfg.c
net/mac80211/sta_info.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge