1 files changed, 38 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2b3aca7e40b9..249e8dd83d4f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -270,12 +270,12 @@ F:	drivers/acpi/
 F:      drivers/pnp/pnpacpi/
 F:      include/linux/acpi.h
 F:      include/acpi/
-F:      Documentation/acpi
+F:      Documentation/acpi/
 F:      Documentation/ABI/testing/sysfs-bus-acpi
 F:      drivers/pci/*acpi*
 F:      drivers/pci/*/*acpi*
 F:      drivers/pci/*/*/*acpi*
-F:      tools/power/acpi
+F:      tools/power/acpi/
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:      Robert Moore <robert.moore@intel.com>
@@ -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>
@@ -3512,6 +3513,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/
@@ -4952,6 +4955,16 @@ F:	Documentation/input/multi-touch-protocol.txt
 F:      drivers/input/input-mt.c
 K:      \b(ABS|SYN)_MT_
 
+INTEL ASoC BDW/HSW DRIVERS
+M:      Jie Yang <yang.jie@linux.intel.com>
+L:      alsa-devel@alsa-project.org
+S:      Supported
+F:      sound/soc/intel/sst-haswell*
+F:      sound/soc/intel/sst-dsp*
+F:      sound/soc/intel/sst-firmware.c
+F:      sound/soc/intel/broadwell.c
+F:      sound/soc/intel/haswell.c
+
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:      Intel SCU Linux support <intel-linux-scu@intel.com>
 M:      Artur Paszkiewicz <artur.paszkiewicz@intel.com>
@@ -5839,6 +5852,21 @@ F:	Documentation/misc-devices/lis3lv02d
 F:      drivers/misc/lis3lv02d/
 F:      drivers/platform/x86/hp_accel.c
 
+LIVE PATCHING
+M:      Josh Poimboeuf <jpoimboe@redhat.com>
+M:      Seth Jennings <sjenning@redhat.com>
+M:      Jiri Kosina <jkosina@suse.cz>
+M:      Vojtech Pavlik <vojtech@suse.cz>
+S:      Maintained
+F:      kernel/livepatch/
+F:      include/linux/livepatch.h
+F:      arch/x86/include/asm/livepatch.h
+F:      arch/x86/kernel/livepatch.c
+F:      Documentation/ABI/testing/sysfs-kernel-livepatch
+F:      samples/livepatch/
+L:      live-patching@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
+
 LLC (802.2)
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:      Maintained
@@ -7265,6 +7293,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
@@ -9249,7 +9285,6 @@ F:	drivers/net/ethernet/dlink/sundance.c
 
 SUPERH
 L:      linux-sh@vger.kernel.org
-W:      http://www.linux-sh.org
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
 S:      Orphan
 F:      Documentation/sh/