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

# Conflicts:
#	MAINTAINERS

diff --cc MAINTAINERS
index e7fdfb86230a4e3dec8e9b8fd7eefd03bd3d3e70,3fb0fa67576d7f50bc9ba0327a7264bcb54c99cf..7b200a1ee5b70a774c55b4b54fb42e13f8b8a6fe
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3091,13 -3063,16 +3103,23 @@@ F:   drivers/mmc/host/sdhci-of-arasan.
  N:    zynq
  N:    xilinx
  
 +ARM64 FIT SUPPORT
 +M:    Simon Glass <sjg@chromium.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/Makefile
 +F:    scripts/make_fit.py
 +
+ ARM64 PLATFORM DRIVERS
+ M:    Hans de Goede <hdegoede@redhat.com>
+ M:    Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
+ R:    Bryan O'Donoghue <bryan.odonoghue@linaro.org>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ Q:    https://patchwork.kernel.org/project/platform-driver-x86/list/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
+ F:    drivers/platform/arm64/
+ 
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <catalin.marinas@arm.com>
  M:    Will Deacon <will@kernel.org>

diff --cc drivers/platform/x86/intel/vbtn.c
Simple merge

diff --cc drivers/platform/x86/toshiba_acpi.c
Simple merge

diff --cc drivers/platform/x86/uv_sysfs.c
Simple merge