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

This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

1 files changed, 6 insertions, 9 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index aa97dffe59e1..f5c4567b46ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -698,7 +698,7 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      sound/soc/blackfin/*
- 
+
 ANALOG DEVICES INC IIO DRIVERS
 M:      Lars-Peter Clausen <lars@metafoo.de>
 M:      Michael Hennerich <Michael.Hennerich@analog.com>
@@ -4752,14 +4752,14 @@ S:	Supported
 F:      drivers/net/ethernet/ibm/ibmveth.*
 
 IBM Power Virtual SCSI Device Drivers
-M:      Nathan Fontenot <nfont@linux.vnet.ibm.com>
+M:      Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/ibmvscsi/ibmvscsi*
 F:      drivers/scsi/ibmvscsi/viosrp.h
 
 IBM Power Virtual FC Device Drivers
-M:      Brian King <brking@linux.vnet.ibm.com>
+M:      Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/ibmvscsi/ibmvfc*
@@ -4948,7 +4948,6 @@ K:	\b(ABS|SYN)_MT_
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:      Intel SCU Linux support <intel-linux-scu@intel.com>
 M:      Artur Paszkiewicz <artur.paszkiewicz@intel.com>
-M:      Dave Jiang <dave.jiang@intel.com>
 L:      linux-scsi@vger.kernel.org
 T:      git git://git.code.sf.net/p/intel-sas/isci
 S:      Supported
@@ -7026,14 +7025,12 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:      Grant Likely <grant.likely@linaro.org>
 M:      Rob Herring <robh+dt@kernel.org>
 L:      devicetree@vger.kernel.org
-W:      http://fdt.secretlab.ca
-T:      git git://git.secretlab.ca/git/linux-2.6.git
+W:      http://www.devicetree.org/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
 S:      Maintained
 F:      drivers/of/
 F:      include/linux/of*.h
 F:      scripts/dtc/
-K:      of_get_property
-K:      of_match_table
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 M:      Rob Herring <robh+dt@kernel.org>
@@ -7278,7 +7275,7 @@ S:	Maintained
 F:      drivers/pci/host/*layerscape*
 
 PCI DRIVER FOR IMX6
-M:      Richard Zhu <r65037@freescale.com>
+M:      Richard Zhu <Richard.Zhu@freescale.com>
 M:      Lucas Stach <l.stach@pengutronix.de>
 L:      linux-pci@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)