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

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/rt2500usb.c
Simple merge

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

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

diff --cc drivers/net/wireless/zd1211rw/zd_mac.c
Simple merge

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