MAINTAINERS: move Jens Osterkamp to CREDITS

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 90878f3234578564b7a3722930f153cbb33e4ab5..67afc4de50ceab2b476d5e0bcfaf0486a3f7e96d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2280,7 +2280,7 @@ S:        Maintained
 F:     arch/mips/bmips/*
 F:     arch/mips/include/asm/mach-bmips/*
 F:     arch/mips/kernel/*bmips*
-F:     arch/mips/boot/dts/bcm*.dts*
+F:     arch/mips/boot/dts/brcm/bcm*.dts*
 F:     drivers/irqchip/irq-bcm7*
 F:     drivers/irqchip/irq-brcmstb*
 
@@ -2339,7 +2339,7 @@ M:        Ray Jui <rjui@broadcom.com>
 L:     bcm-kernel-feedback-list@broadcom.com
 S:     Supported
 F:     drivers/gpio/gpio-bcm-kona.c
-F:     Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+F:     Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
 
 BROADCOM NVRAM DRIVER
 M:     Rafał Miłecki <zajec5@gmail.com>
@@ -5285,11 +5285,10 @@ INTEL ASoC BDW/HSW DRIVERS
 M:     Jie Yang <yang.jie@linux.intel.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 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
+F:     sound/soc/intel/common/sst-dsp*
+F:     sound/soc/intel/common/sst-firmware.c
+F:     sound/soc/intel/boards/broadwell.c
+F:     sound/soc/intel/haswell/
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:     Intel SCU Linux support <intel-linux-scu@intel.com>
@@ -7019,7 +7018,6 @@ L:        nbd-general@lists.sourceforge.net
 T:     git git://git.pengutronix.de/git/mpa/linux-nbd.git
 F:     Documentation/blockdev/nbd.txt
 F:     drivers/block/nbd.c
-F:     include/linux/nbd.h
 F:     include/uapi/linux/nbd.h
 
 NETWORK DROP MONITOR
@@ -7647,7 +7645,6 @@ F:        arch/*/include/asm/paravirt.h
 PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
 M:     Tim Waugh <tim@cyberelk.net>
 L:     linux-parport@lists.infradead.org (subscribers-only)
-W:     http://www.torque.net/linux-pp.html
 S:     Maintained
 F:     Documentation/blockdev/paride.txt
 F:     drivers/block/paride/
@@ -9593,7 +9590,6 @@ F:        include/uapi/linux/spi/
 
 SPIDERNET NETWORK DRIVER for CELL
 M:     Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
-M:     Jens Osterkamp <jens@de.ibm.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     Documentation/networking/spider_net.txt