Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[cascardo/linux.git] / MAINTAINERS
index 99f60c4..0f3063c 100644 (file)
@@ -679,11 +679,19 @@ F:        drivers/gpu/drm/radeon/radeon_kfd.c
 F:     drivers/gpu/drm/radeon/radeon_kfd.h
 F:     include/uapi/linux/kfd_ioctl.h
 
+AMD SEATTLE DEVICE TREE SUPPORT
+M:     Brijesh Singh <brijeshkumar.singh@amd.com>
+M:     Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
+M:     Tom Lendacky <thomas.lendacky@amd.com>
+S:     Supported
+F:     arch/arm64/boot/dts/amd/
+
 AMD XGBE DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/amd/xgbe/
+F:     arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
 
 AMS (Apple Motion Sensor) DRIVER
 M:     Michael Hanselmann <linux-kernel@hansmi.ch>
@@ -839,6 +847,12 @@ S: Maintained
 F:     drivers/net/arcnet/
 F:     include/uapi/linux/if_arcnet.h
 
+ARM HDLCD DRM DRIVER
+M:     Liviu Dudau <liviu.dudau@arm.com>
+S:     Supported
+F:     drivers/gpu/drm/arm/
+F:     Documentation/devicetree/bindings/display/arm,hdlcd.txt
+
 ARM MFM AND FLOPPY DRIVERS
 M:     Ian Molton <spyro@f2s.com>
 S:     Maintained
@@ -1824,11 +1838,13 @@ F:      drivers/edac/synopsys_edac.c
 
 ARM SMMU DRIVERS
 M:     Will Deacon <will.deacon@arm.com>
+R:     Robin Murphy <robin.murphy@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/iommu/arm-smmu.c
 F:     drivers/iommu/arm-smmu-v3.c
 F:     drivers/iommu/io-pgtable-arm.c
+F:     drivers/iommu/io-pgtable-arm-v7s.c
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:     Catalin Marinas <catalin.marinas@arm.com>
@@ -3746,7 +3762,7 @@ F:        drivers/gpu/vga/
 F:     include/drm/
 F:     include/uapi/drm/
 
-RADEON DRM DRIVERS
+RADEON and AMDGPU DRM DRIVERS
 M:     Alex Deucher <alexander.deucher@amd.com>
 M:     Christian König <christian.koenig@amd.com>
 L:     dri-devel@lists.freedesktop.org
@@ -3754,6 +3770,8 @@ T:        git git://people.freedesktop.org/~agd5f/linux
 S:     Supported
 F:     drivers/gpu/drm/radeon/
 F:     include/uapi/drm/radeon*
+F:     drivers/gpu/drm/amd/
+F:     include/uapi/drm/amdgpu*
 
 DRM PANEL DRIVERS
 M:     Thierry Reding <thierry.reding@gmail.com>
@@ -3798,7 +3816,7 @@ F:        include/drm/exynos*
 F:     include/uapi/drm/exynos*
 
 DRM DRIVERS FOR FREESCALE DCU
-M:     Jianwei Wang <jianwei.wang.chn@gmail.com>
+M:     Stefan Agner <stefan@agner.ch>
 M:     Alison Wang <alison.wang@freescale.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
@@ -4346,6 +4364,12 @@ L:       dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/exynos/exynos_dp*
 
+EXYNOS SYSMMU (IOMMU) driver
+M:     Marek Szyprowski <m.szyprowski@samsung.com>
+L:     iommu@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/iommu/exynos-iommu.c
+
 EXYNOS MIPI DISPLAY DRIVERS
 M:     Inki Dae <inki.dae@samsung.com>
 M:     Donghwa Lee <dh09.lee@samsung.com>
@@ -5246,6 +5270,16 @@ F:       include/linux/hyperv.h
 F:     tools/hv/
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 
+I2C MUXES
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     Documentation/i2c/muxes/
+F:     Documentation/devicetree/bindings/i2c/i2c-mux*
+F:     drivers/i2c/i2c-mux.c
+F:     drivers/i2c/muxes/
+F:     include/linux/i2c-mux.h
+
 I2C OVER PARALLEL PORT
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
@@ -7857,6 +7891,11 @@ L:       alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/tfa9879*
 
+OBJTOOL
+M:     Josh Poimboeuf <jpoimboe@redhat.com>
+S:     Supported
+F:     tools/objtool/
+
 OMAP SUPPORT
 M:     Tony Lindgren <tony@atomide.com>
 L:     linux-omap@vger.kernel.org
@@ -9647,9 +9686,9 @@ F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
 F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
 
 SYNOPSYS DESIGNWARE I2C DRIVER
-M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
-M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+R:     Mika Westerberg <mika.westerberg@linux.intel.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-designware-*
@@ -9815,10 +9854,12 @@ S:      Maintained
 F:     drivers/mmc/host/sdricoh_cs.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
+M:     Adrian Hunter <adrian.hunter@intel.com>
 L:     linux-mmc@vger.kernel.org
-S:     Orphan
-F:     drivers/mmc/host/sdhci.*
-F:     drivers/mmc/host/sdhci-pltfm.[ch]
+T:     git git://git.infradead.org/users/ahunter/linux-sdhci.git
+S:     Maintained
+F:     drivers/mmc/host/sdhci*
+F:     include/linux/mmc/sdhci*
 
 SECURE COMPUTING
 M:     Kees Cook <keescook@chromium.org>
@@ -10270,7 +10311,7 @@ F:      drivers/media/pci/solo6x10/
 SOFTWARE RAID (Multiple Disks) SUPPORT
 M:     Shaohua Li <shli@kernel.org>
 L:     linux-raid@vger.kernel.org
-T:     git git://neil.brown.name/md
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
 S:     Supported
 F:     drivers/md/
 F:     include/linux/raid/