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

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

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.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 drivers/net/wireless/rt2x00/rt2400pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2500pci.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt61pci.c
Simple merge