Merge commit 'v3.17' into next

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 33363e9db6106b1725e7cea92cbcf25e0cc25b81..ccb0feff5aaf535690c54e590ef10311a58dbab3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2104,7 +2104,7 @@ S:        Supported
 F:     drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
-M:     Rasesh Mody <rmody@brocade.com>
+M:     Rasesh Mody <rasesh.mody@qlogic.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/brocade/bna/
@@ -3018,9 +3018,8 @@ S:        Supported
 F:     drivers/acpi/dock.c
 
 DOCUMENTATION
-M:     Randy Dunlap <rdunlap@infradead.org>
+M:     Jiri Kosina <jkosina@suse.cz>
 L:     linux-doc@vger.kernel.org
-T:     quilt http://www.infradead.org/~rdunlap/Doc/patches/
 S:     Maintained
 F:     Documentation/
 X:     Documentation/ABI/
@@ -4483,7 +4482,6 @@ 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-acpi.c
 
 I2C-TAOS-EVM DRIVER
 M:     Jean Delvare <jdelvare@suse.de>
@@ -5486,7 +5484,7 @@ F:        drivers/macintosh/
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:     Anatolij Gustschin <agust@denx.de>
 L:     linuxppc-dev@lists.ozlabs.org
-T:     git git://git.denx.de/linux-2.6-agust.git
+T:     git git://git.denx.de/linux-denx-agust.git
 S:     Maintained
 F:     arch/powerpc/platforms/512x/
 F:     arch/powerpc/platforms/52xx/
@@ -8096,6 +8094,8 @@ F:        drivers/mmc/host/sdhci-pltfm.[ch]
 
 SECURE COMPUTING
 M:     Kees Cook <keescook@chromium.org>
+R:     Andy Lutomirski <luto@amacapital.net>
+R:     Will Drewry <wad@chromium.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp
 S:     Supported
 F:     kernel/seccomp.c