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

diff --cc drivers/net/wireless/iwlwifi/mvm/debugfs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge