Merge tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux...

Pull x86 platform driver updates from Darren Hart:
 "Emergency travel prevented me from completing my final testing on this
  until today.  Nothing here that couldn't wait until RC1 fixes, but I
  thought it best to get it out sooner rather than later as it does
  contain a build warning fix.

  Summary:

  A build warning fix, MAINTAINERS cleanup, and a new DMI quirk:

  ideapad-laptop:
   - Add Lenovo Yoga 700 to no_hw_rfkill dmi list

  MAINTAINERS:
   - Combine multiple telemetry entries

  intel_telemetry_debugfs:
   - Fix unused warnings in telemetry debugfs"

* tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list
  MAINTAINERS: Combine multiple telemetry entries
  intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs

diff --combined MAINTAINERS
index 59373e5bb09ee1c9d5804c968440ea57087c4564,4ad9d7c46cac2df28e024d7beeebdb77263bf7c8..78f71f471bd6df1fb3ca31ff6e32240f4dbdb90a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3665,12 -3665,13 +3665,12 @@@ F:   drivers/scsi/dpt
  F:    drivers/scsi/dpt/
  
  DRBD DRIVER
 -P:    Philipp Reisner
 -P:    Lars Ellenberg
 -M:    drbd-dev@lists.linbit.com
 -L:    drbd-user@lists.linbit.com
 +M:    Philipp Reisner <philipp.reisner@linbit.com>
 +M:    Lars Ellenberg <lars.ellenberg@linbit.com>
 +L:    drbd-dev@lists.linbit.com
  W:    http://www.drbd.org
 -T:    git git://git.drbd.org/linux-2.6-drbd.git drbd
 -T:    git git://git.drbd.org/drbd-8.3.git
 +T:    git git://git.linbit.com/linux-drbd.git
 +T:    git git://git.linbit.com/drbd-8.4.git
  S:    Supported
  F:    drivers/block/drbd/
  F:    lib/lru_cache.c
@@@ -5780,10 -5781,8 +5780,8 @@@ INTEL TELEMETRY DRIVE
  M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
- F:    drivers/platform/x86/intel_telemetry_core.c
  F:    arch/x86/include/asm/intel_telemetry.h
- F:    drivers/platform/x86/intel_telemetry_pltdrv.c
- F:    drivers/platform/x86/intel_telemetry_debugfs.c
+ F:    drivers/platform/x86/intel_telemetry*
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -7151,45 -7150,27 +7149,45 @@@ W:   https://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/radio/radio-miropcm20*
  
 -Mellanox MLX5 core VPI driver
 -M:    Eli Cohen <eli@mellanox.com>
 +MELLANOX MLX4 core VPI driver
 +M:    Yishai Hadas <yishaih@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +S:    Supported
 +F:    drivers/net/ethernet/mellanox/mlx4/
 +F:    include/linux/mlx4/
 +
 +MELLANOX MLX4 IB driver
 +M:    Yishai Hadas <yishaih@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://openfabrics.org/~eli/connect-ib.git
 +S:    Supported
 +F:    drivers/infiniband/hw/mlx4/
 +F:    include/linux/mlx4/
 +
 +MELLANOX MLX5 core VPI driver
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
  
 -Mellanox MLX5 IB driver
 -M:    Eli Cohen <eli@mellanox.com>
 +MELLANOX MLX5 IB driver
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://openfabrics.org/~eli/connect-ib.git
  S:    Supported
 -F:    include/linux/mlx5/
  F:    drivers/infiniband/hw/mlx5/
 +F:    include/linux/mlx5/
  
  MELEXIS MLX90614 DRIVER
  M:    Crt Mori <cmo@melexis.com>
@@@ -7720,12 -7701,6 +7718,12 @@@ W:    https://github.com/jonmason/ntb/wik
  T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/hw/intel/
  
 +NTB AMD DRIVER
 +M:    Xiangliang Yu <Xiangliang.Yu@amd.com>
 +L:    linux-ntb@googlegroups.com
 +S:    Supported
 +F:    drivers/ntb/hw/amd/
 +
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
@@@ -10477,11 -10452,9 +10475,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/dlink/sundance.c
  
  SUPERH
 +M:    Yoshinori Sato <ysato@users.sourceforge.jp>
 +M:    Rich Felker <dalias@libc.org>
  L:    linux-sh@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/sh/
  F:    arch/sh/
  F:    drivers/sh/