IP_GRE: Fix GRE_CSUM case.

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 70f025fbbd33611f9fad3be00a15f05b58859f6a..cdb8fe8b6182f25cf509cefa5817be0156b6d188 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -670,8 +670,16 @@ F: drivers/input/serio/ambakmi.*
 F:     include/linux/amba/kmi.h
 
 ARM PRIMECELL MMCI PL180/1 DRIVER
-S:     Orphan
+M:     Russell King <linux@arm.linux.org.uk>
+S:     Maintained
 F:     drivers/mmc/host/mmci.*
+F:     include/linux/amba/mmci.h
+
+ARM PRIMECELL UART PL010 AND PL011 DRIVERS
+M:     Russell King <linux@arm.linux.org.uk>
+S:     Maintained
+F:     drivers/tty/serial/amba-pl01*.c
+F:     include/linux/amba/serial.h
 
 ARM PRIMECELL BUS SUPPORT
 M:     Russell King <linux@arm.linux.org.uk>
@@ -2974,11 +2982,6 @@ S:       Maintained
 F:     include/linux/netfilter_bridge/
 F:     net/bridge/
 
-ETHERTEAM 16I DRIVER
-M:     Mika Kuoppala <miku@iki.fi>
-S:     Maintained
-F:     drivers/net/ethernet/fujitsu/eth16i.c
-
 EXT2 FILE SYSTEM
 M:     Jan Kara <jack@suse.cz>
 L:     linux-ext4@vger.kernel.org
@@ -4480,6 +4483,15 @@ F:       arch/s390/include/asm/kvm*
 F:     arch/s390/kvm/
 F:     drivers/s390/kvm/
 
+KERNEL VIRTUAL MACHINE (KVM) FOR ARM
+M:     Christoffer Dall <cdall@cs.columbia.edu>
+L:     kvmarm@lists.cs.columbia.edu
+W:     http://systems.cs.columbia.edu/projects/kvm-arm
+S:     Maintained
+F:     arch/arm/include/uapi/asm/kvm*
+F:     arch/arm/include/asm/kvm*
+F:     arch/arm/kvm/
+
 KEXEC
 M:     Eric Biederman <ebiederm@xmission.com>
 W:     http://kernel.org/pub/linux/utils/kernel/kexec/
@@ -5368,13 +5380,6 @@ F:       include/linux/sunrpc/
 F:     include/uapi/linux/nfs*
 F:     include/uapi/linux/sunrpc/
 
-NI5010 NETWORK DRIVER
-M:     Jan-Pascal van Best <janpascal@vanbest.org>
-M:     Andreas Mohr <andi@lisas.de>
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/net/ethernet/racal/ni5010.*
-
 NILFS2 FILESYSTEM
 M:     KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
 L:     linux-nilfs@vger.kernel.org
@@ -7527,7 +7532,7 @@ S:        Maintained
 F:     drivers/media/tuners/tea5767.*
 
 TEAM DRIVER
-M:     Jiri Pirko <jpirko@redhat.com>
+M:     Jiri Pirko <jiri@resnulli.us>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/team/