Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/libertas/cfg.c
Simple merge

diff --cc drivers/net/wireless/libertas/dev.h
Simple merge

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

diff --cc include/linux/pci_ids.h
Simple merge

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

diff --cc net/wireless/nl80211.c
Simple merge