Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/dvm/sta.c
Simple merge

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

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

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