Merge tag 'nfsd-4.13' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7ad8107b47dba72c1c31f18c4af94580e6ca84c1..7d9bd4a041aff9254ce43f85ca173da777087c19 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1139,6 +1139,18 @@ F:       arch/arm/mach-aspeed/
 F:     arch/arm/boot/dts/aspeed-*
 F:     drivers/*/*aspeed*
 
+ARM/ASPEED I2C DRIVER
+M:     Brendan Higgins <brendanhiggins@google.com>
+R:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
+R:     Joel Stanley <joel@jms.id.au>
+L:     linux-i2c@vger.kernel.org
+L:     openbmc@lists.ozlabs.org
+S:     Maintained
+F:     drivers/irqchip/irq-aspeed-i2c-ic.c
+F:     drivers/i2c/busses/i2c-aspeed.c
+F:     Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-i2c-ic.txt
+F:     Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
+
 ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
 M:     Nicolas Ferre <nicolas.ferre@microchip.com>
 M:     Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@ -1243,7 +1255,7 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://github.com/ulli-kroll/linux.git
 S:     Maintained
 F:     arch/arm/mach-gemini/
-F:     drivers/rtc/rtc-gemini.c
+F:     drivers/rtc/rtc-ftrtc010.c
 
 ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 M:     Barry Song <baohua@kernel.org>
@@ -3319,9 +3331,10 @@ F:       Documentation/devicetree/bindings/input/touchscreen/chipone_icn8318.txt
 F:     drivers/input/touchscreen/chipone_icn8318.c
 
 CHROME HARDWARE PLATFORM SUPPORT
+M:     Benson Leung <bleung@chromium.org>
 M:     Olof Johansson <olof@lixom.net>
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git
 F:     drivers/platform/chrome/
 
 CISCO VIC ETHERNET NIC DRIVER
@@ -3961,6 +3974,12 @@ M:       Pali Rohár <pali.rohar@gmail.com>
 S:     Maintained
 F:     drivers/platform/x86/dell-wmi.c
 
+DENALI NAND DRIVER
+M:     Masahiro Yamada <yamada.masahiro@socionext.com>
+L:     linux-mtd@lists.infradead.org
+S:     Supported
+F:     drivers/mtd/nand/denali*
+
 DESIGNWARE USB2 DRD IP DRIVER
 M:     John Youn <johnyoun@synopsys.com>
 L:     linux-usb@vger.kernel.org
@@ -6381,6 +6400,7 @@ M:        Mika Westerberg <mika.westerberg@linux.intel.com>
 L:     linux-i2c@vger.kernel.org
 L:     linux-acpi@vger.kernel.org
 S:     Maintained
+F:     drivers/i2c/i2c-core-acpi.c
 
 I2C-TAOS-EVM DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
@@ -10559,6 +10579,17 @@ W:     http://wireless.kernel.org/en/users/Drivers/p54
 S:     Obsolete
 F:     drivers/net/wireless/intersil/prism54/
 
+PROC SYSCTL
+M:     "Luis R. Rodriguez" <mcgrof@kernel.org>
+M:     Kees Cook <keescook@chromium.org>
+L:     linux-kernel@vger.kernel.org
+L:     linux-fsdevel@vger.kernel.org
+S:     Maintained
+F:     fs/proc/proc_sysctl.c
+F:     include/linux/sysctl.h
+F:     kernel/sysctl.c
+F:     tools/testing/selftests/sysctl/
+
 PS3 NETWORK SUPPORT
 M:     Geoff Levand <geoff@infradead.org>
 L:     netdev@vger.kernel.org
@@ -12439,7 +12470,8 @@ M:      Marek Vasut <marek.vasut@gmail.com>
 L:     linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
-T:     git git://github.com/spi-nor/linux.git
+T:     git git://git.infradead.org/linux-mtd.git spi-nor/fixes
+T:     git git://git.infradead.org/l2-mtd.git spi-nor/next
 S:     Maintained
 F:     drivers/mtd/spi-nor/
 F:     include/linux/mtd/spi-nor.h