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

drivers/net/wireless/iwlwifi/Kconfig

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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