Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...

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

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

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

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

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