Merge tag 'wireless-drivers-next-for-davem-2017-06-30' of git://git.kernel.org/pub...

Kalle Valo says:

====================
wireless-drivers-next patches for 4.13

Mostly fixes and cleanups, but iwlwifi and rtlwifi had also some new
features.

Major changes:

iwlwifi

* some changes in suspend/resume handling to support new FWs

* Continued work towards the A000 family

* support for a new version of the TX flush FW API

* remove some noise from the kernel logs

rtlwifi

* more bluetooth coexistance improvements
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --combined MAINTAINERS
index 4c913c8,f81e1b7..8e9495a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2785,8 -2785,11 +2785,11 @@@ BROADCOM BRCM80211 IEEE802.11n WIRELES
  M:    Arend van Spriel <arend.vanspriel@broadcom.com>
  M:    Franky Lin <franky.lin@broadcom.com>
  M:    Hante Meuleman <hante.meuleman@broadcom.com>
+ M:    Chi-Hsien Lin <chi-hsien.lin@cypress.com>
+ M:    Wright Feng <wright.feng@cypress.com>
  L:    linux-wireless@vger.kernel.org
  L:    brcm80211-dev-list.pdl@broadcom.com
+ L:    brcm80211-dev-list@cypress.com
  S:    Supported
  F:    drivers/net/wireless/broadcom/brcm80211/
  
@@@ -2964,7 -2967,7 +2967,7 @@@ F:      sound/pci/oxygen
  
  C6X ARCHITECTURE
  M:    Mark Salter <msalter@redhat.com>
 -M:    Aurelien Jacquiot <a-jacquiot@ti.com>
 +M:    Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
  L:    linux-c6x-dev@linux-c6x.org
  W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
  S:    Maintained
@@@ -8327,16 -8330,6 +8330,16 @@@ Q:    http://patchwork.ozlabs.org/project/
  F:    drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:    include/linux/mlx5/mlx5_ifc_fpga.h
  
 +MELLANOX ETHERNET INNOVA IPSEC DRIVER
 +M:    Ilan Tayari <ilant@mellanox.com>
 +R:    Boris Pismenny <borisp@mellanox.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
 +F:    drivers/net/ethernet/mellanox/mlx5/core/ipsec*
 +
  MELLANOX ETHERNET SWITCH DRIVERS
  M:    Jiri Pirko <jiri@mellanox.com>
  M:    Ido Schimmel <idosch@mellanox.com>