Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6...

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar5008_phy.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/htc_hst.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/pci.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/ath/carl9170/carl9170.h
Simple merge

diff --cc drivers/net/wireless/ath/hw.c
Simple merge

diff --cc drivers/net/wireless/b43/b43.h
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-tx.c
Simple merge

diff --cc drivers/staging/wlan-ng/cfg80211.c
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/mesh_pathtbl.c
Simple merge