1 files changed, 22 insertions, 10 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3b9aa4ddd30b..5ccf370e052b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1278,7 +1278,6 @@ F:	drivers/input/misc/ati_remote2.c
 ATLX ETHERNET DRIVERS
 M:      Jay Cliburn <jcliburn@gmail.com>
 M:      Chris Snook <chris.snook@gmail.com>
-M:      Jie Yang <jie.yang@atheros.com>
 L:      netdev@vger.kernel.org
 W:      http://sourceforge.net/projects/atl1
 W:      http://atl1.sourceforge.net
@@ -1574,7 +1573,6 @@ F:	drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
 M:      Rasesh Mody <rmody@brocade.com>
-M:      Debashis Dutt <ddutt@brocade.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/bna/
@@ -1758,7 +1756,6 @@ F:	Documentation/zh_CN/
 
 CISCO VIC ETHERNET NIC DRIVER
 M:      Christian Benvenuti <benve@cisco.com>
-M:      Vasanthy Kolluri <vkolluri@cisco.com>
 M:      Roopa Prabhu <roprabhu@cisco.com>
 M:      David Wang <dwang2@cisco.com>
 S:      Supported
@@ -2463,7 +2460,7 @@ S:	Supported
 F:      drivers/infiniband/hw/ehca/
 
 EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
-M:      Breno Leitao <leitao@linux.vnet.ibm.com>
+M:      Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ehea/
@@ -2555,6 +2552,11 @@ S:	Maintained
 F:      Documentation/filesystems/ext4.txt
 F:      fs/ext4/
 
+Extended Verification Module (EVM)
+M:      Mimi Zohar <zohar@us.ibm.com>
+S:      Supported
+F:      security/integrity/evm/
+
 F71805F HARDWARE MONITORING DRIVER
 M:      Jean Delvare <khali@linux-fr.org>
 L:      lm-sensors@lm-sensors.org
@@ -3316,7 +3318,7 @@ M:	David Woodhouse <dwmw2@infradead.org>
 L:      iommu@lists.linux-foundation.org
 T:      git git://git.infradead.org/iommu-2.6.git
 S:      Supported
-F:      drivers/pci/intel-iommu.c
+F:      drivers/iommu/intel-iommu.c
 F:      include/linux/intel-iommu.h
 
 INTEL IOP-ADMA DMA DRIVER
@@ -4415,7 +4417,8 @@ L:	netfilter@vger.kernel.org
 L:      coreteam@netfilter.org
 W:      http://www.netfilter.org/
 W:      http://www.iptables.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
 S:      Supported
 F:      include/linux/netfilter*
 F:      include/linux/netfilter/
@@ -6368,15 +6371,14 @@ F:	net/ipv4/tcp_lp.c
 
 TEGRA SUPPORT
 M:      Colin Cross <ccross@android.com>
-M:      Erik Gilling <konkers@android.com>
 M:      Olof Johansson <olof@lixom.net>
+M:      Stephen Warren <swarren@nvidia.com>
 L:      linux-tegra@vger.kernel.org
-T:      git git://android.git.kernel.org/kernel/tegra.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
 S:      Supported
 F:      arch/arm/mach-tegra
 
 TEHUTI ETHERNET DRIVER
-M:      Alexander Indenbaum <baum@tehutinetworks.net>
 M:      Andy Gospodarek <andy@greyhouse.net>
 L:      netdev@vger.kernel.org
 S:      Supported
@@ -6450,7 +6452,7 @@ L:	tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for users in English)
 L:      tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
 L:      tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
 W:      http://tomoyo.sourceforge.jp/
-T:      quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.4.x/tomoyo-lsm/patches/
+T:      quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
 S:      Maintained
 F:      security/tomoyo/
 
@@ -7145,6 +7147,12 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 F:      drivers/scsi/wd7000.c
 
+WIIMOTE HID DRIVER
+M:      David Herrmann <dh.herrmann@googlemail.com>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      drivers/hid/hid-wiimote*
+
 WINBOND CIR DRIVER
 M:      David Härdeman <david@hardeman.nu>
 S:      Maintained
@@ -7211,6 +7219,9 @@ W:	http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 S:      Supported
 F:      Documentation/hwmon/wm83??
 F:      drivers/leds/leds-wm83*.c
+F:      drivers/input/misc/wm831x-on.c
+F:      drivers/input/touchscreen/wm831x-ts.c
+F:      drivers/input/touchscreen/wm97*.c
 F:      drivers/mfd/wm8*.c
 F:      drivers/power/wm83*.c
 F:      drivers/rtc/rtc-wm83*.c
@@ -7220,6 +7231,7 @@ F:	drivers/watchdog/wm83*_wdt.c
 F:      include/linux/mfd/wm831x/
 F:      include/linux/mfd/wm8350/
 F:      include/linux/mfd/wm8400*
+F:      include/linux/wm97xx.h
 F:      include/sound/wm????.h
 F:      sound/soc/codecs/wm*