Merge tag 'pm+acpi-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-drm-fsl-dcu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a52ed9cfcbe4905f305ec5f80a2c0dcc3d3c6f67..54c7ce00d85fc4b549815d968dd973487ed68d17 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1586,6 +1586,7 @@ N:        xilinx
 F:     drivers/clocksource/cadence_ttc_timer.c
 F:     drivers/i2c/busses/i2c-cadence.c
 F:     drivers/mmc/host/sdhci-of-arasan.c
+F:     drivers/edac/synopsys_edac.c
 
 ARM SMMU DRIVER
 M:     Will Deacon <will.deacon@arm.com>
@@ -3513,6 +3514,8 @@ M:        Borislav Petkov <bp@alien8.de>
 M:     Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 L:     linux-edac@vger.kernel.org
 W:     bluesmoke.sourceforge.net
+T:     git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+T:     git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
 S:     Supported
 F:     Documentation/edac.txt
 F:     drivers/edac/
@@ -7274,6 +7277,14 @@ F:       include/linux/pci*
 F:     arch/x86/pci/
 F:     arch/x86/kernel/quirks.c
 
+PCI DRIVER FOR ARM VERSATILE PLATFORM
+M:     Rob Herring <robh@kernel.org>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/versatile.txt
+F:     drivers/pci/host/pci-versatile.c
+
 PCI DRIVER FOR APPLIEDMICRO XGENE
 M:     Tanmay Inamdar <tinamdar@apm.com>
 L:     linux-pci@vger.kernel.org