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

drivers/net/wireless/iwlwifi/Kconfig

drivers/net/wireless/iwlwifi/Makefile

drivers/net/wireless/iwlwifi/dvm/agn.h

drivers/net/wireless/iwlwifi/dvm/calib.c

drivers/net/wireless/iwlwifi/dvm/calib.h

drivers/net/wireless/iwlwifi/dvm/commands.h

drivers/net/wireless/iwlwifi/dvm/debugfs.c

drivers/net/wireless/iwlwifi/dvm/lib.c

drivers/net/wireless/iwlwifi/dvm/scan.c

drivers/net/wireless/iwlwifi/dvm/sta.c

drivers/net/wireless/iwlwifi/dvm/testmode.c

drivers/net/wireless/iwlwifi/dvm/tx.c

drivers/net/wireless/iwlwifi/dvm/ucode.c

drivers/net/wireless/iwlwifi/iwl-1000.c

drivers/net/wireless/iwlwifi/iwl-2000.c

drivers/net/wireless/iwlwifi/iwl-5000.c

drivers/net/wireless/iwlwifi/iwl-6000.c

drivers/net/wireless/iwlwifi/iwl-7000.c

drivers/net/wireless/iwlwifi/iwl-agn-hw.h

drivers/net/wireless/iwlwifi/iwl-config.h