1 files changed, 59 insertions, 42 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ac2ea0aada8..3f49df2d977 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -313,11 +313,9 @@ S:	Maintained
 F:      drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
-M:      Michael Wu <flamingice@sourmilk.net>
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/adm8211.*
 
 ADT746X FAN DRIVER
@@ -1369,7 +1367,7 @@ BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:      Eilon Greenstein <eilong@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/bnx2x*
+F:      drivers/net/bnx2x/
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:      Matt Carlson <mcarlson@broadcom.com>
@@ -1571,6 +1569,16 @@ L:	platform-driver-x86@vger.kernel.org
 S:      Supported
 F:      drivers/platform/x86/classmate-laptop.c
 
+COCCINELLE/Semantic Patches (SmPL)
+M:      Julia Lawall <julia@diku.dk>
+M:      Gilles Muller <Gilles.Muller@lip6.fr>
+M:      Nicolas Palix <npalix@diku.dk>
+L:      cocci@diku.dk (moderated for non-subscribers)
+W:      http://coccinelle.lip6.fr/
+S:      Supported
+F:      scripts/coccinelle/
+F:      scripts/coccicheck
+
 CODA FILE SYSTEM
 M:      Jan Harkes <jaharkes@cs.cmu.edu>
 M:      coda@cs.cmu.edu
@@ -1771,6 +1779,13 @@ W:	http://www.openfabrics.org
 S:      Supported
 F:      drivers/infiniband/hw/cxgb4/
 
+CXGB4VF ETHERNET DRIVER (CXGB4VF)
+M:      Casey Leedom <leedom@chelsio.com>
+L:      netdev@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+F:      drivers/net/cxgb4vf/
+
 CYBERPRO FB DRIVER
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2222,6 +2237,7 @@ S:	Maintained
 F:      drivers/net/eth16i.c
 
 EXT2 FILE SYSTEM
+M:      Jan Kara <jack@suse.cz>
 L:      linux-ext4@vger.kernel.org
 S:      Maintained
 F:      Documentation/filesystems/ext2.txt
@@ -2229,8 +2245,9 @@ F:	fs/ext2/
 F:      include/linux/ext2*
 
 EXT3 FILE SYSTEM
+M:      Jan Kara <jack@suse.cz>
 M:      Andrew Morton <akpm@linux-foundation.org>
-M:      Andreas Dilger <adilger@sun.com>
+M:      Andreas Dilger <adilger.kernel@dilger.ca>
 L:      linux-ext4@vger.kernel.org
 S:      Maintained
 F:      Documentation/filesystems/ext3.txt
@@ -2239,7 +2256,7 @@ F:	include/linux/ext3*
 
 EXT4 FILE SYSTEM
 M:      "Theodore Ts'o" <tytso@mit.edu>
-M:      Andreas Dilger <adilger@sun.com>
+M:      Andreas Dilger <adilger.kernel@dilger.ca>
 L:      linux-ext4@vger.kernel.org
 W:      http://ext4.wiki.kernel.org
 Q:      http://patchwork.ozlabs.org/project/linux-ext4/list/
@@ -2621,6 +2638,14 @@ S:	Maintained
 F:      Documentation/blockdev/cpqarray.txt
 F:      drivers/block/cpqarray.*
 
+HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
+M:      Stephen M. Cameron <scameron@beardog.cce.hp.com>
+L:      iss_storagedev@hp.com
+S:      Supported
+F:      Documentation/scsi/hpsa.txt
+F:      drivers/scsi/hpsa*.[ch]
+F:      include/linux/cciss*.h
+
 HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 M:      Mike Miller <mike.miller@hp.com>
 L:      iss_storagedev@hp.com
@@ -3254,8 +3279,8 @@ F:	fs/autofs4/
 
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:      Michal Marek <mmarek@suse.cz>
-T:      git git://repo.or.cz/linux-kbuild.git for-next
-T:      git git://repo.or.cz/linux-kbuild.git for-linus
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git for-next
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes
 L:      linux-kbuild@vger.kernel.org
 S:      Maintained
 F:      Documentation/kbuild/
@@ -3381,13 +3406,6 @@ F:	include/linux/kmemleak.h
 F:      mm/kmemleak.c
 F:      mm/kmemleak-test.c
 
-KMEMTRACE
-M:      Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
-S:      Maintained
-F:      Documentation/trace/kmemtrace.txt
-F:      include/linux/kmemtrace.h
-F:      kernel/trace/kmemtrace.c
-
 KPROBES
 M:      Ananth N Mavinakayanahalli <ananth@in.ibm.com>
 M:      Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
@@ -3687,7 +3705,7 @@ F:	include/linux/mv643xx.h
 MARVELL MWL8K WIRELESS DRIVER
 M:      Lennert Buytenhek <buytenh@wantstofly.org>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@ -3916,17 +3934,19 @@ L:	netem@lists.linux-foundation.org
 S:      Maintained
 F:      net/sched/sch_netem.c
 
-NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
-M:      Ramkrishna Vepa <ram.vepa@neterion.com>
-M:      Rastapur Santosh <santosh.rastapur@neterion.com>
-M:      Sivakumar Subramani <sivakumar.subramani@neterion.com>
-M:      Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
+NETERION 10GbE DRIVERS (s2io/vxge)
+M:      Ramkrishna Vepa <ramkrishna.vepa@exar.com>
+M:      Sivakumar Subramani <sivakumar.subramani@exar.com>
+M:      Sreenivasa Honnur <sreenivasa.honnur@exar.com>
+M:      Jon Mason <jon.mason@exar.com>
 L:      netdev@vger.kernel.org
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:      Supported
 F:      Documentation/networking/s2io.txt
 F:      drivers/net/s2io*
+F:      Documentation/networking/vxge.txt
+F:      drivers/net/vxge/
 
 NETFILTER/IPTABLES/IPCHAINS
 P:      Rusty Russell
@@ -4273,10 +4293,9 @@ F:	include/scsi/osd_*
 F:      fs/exofs/
 
 P54 WIRELESS DRIVER
-M:      Michael Wu <flamingice@sourmilk.net>
+M:      Christian Lamparter <chunkeey@googlemail.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://prism54.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+W:      http://wireless.kernel.org/en/users/Drivers/p54
 S:      Maintained
 F:      drivers/net/wireless/p54/
 
@@ -4538,7 +4557,7 @@ PRISM54 WIRELESS DRIVER
 M:      "Luis R. Rodriguez" <mcgrof@gmail.com>
 L:      linux-wireless@vger.kernel.org
 W:      http://prism54.org
-S:      Maintained
+S:      Obsolete
 F:      drivers/net/wireless/prism54/
 
 PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
@@ -4718,7 +4737,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
 F:      drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
-M:      Nick Piggin <npiggin@suse.de>
+M:      Nick Piggin <npiggin@kernel.dk>
 S:      Maintained
 F:      Documentation/blockdev/ramdisk.txt
 F:      drivers/block/brd.c
@@ -4734,9 +4753,8 @@ S:	Maintained
 F:      drivers/rapidio/
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
-M:      Corey Thomas <coreythomas@charter.net>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
@@ -5062,6 +5080,14 @@ S:	Supported
 F:      include/linux/selinux*
 F:      security/selinux/
 
+APPARMOR SECURITY MODULE
+M:      John Johansen <john.johansen@canonical.com>
+L:      apparmor@lists.ubuntu.com (subscribers-only, general discussion)
+W:      apparmor.wiki.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+S:      Supported
+F:      security/apparmor/
+
 SENSABLE PHANTOM
 M:      Jiri Slaby <jirislaby@gmail.com>
 S:      Maintained
@@ -5337,7 +5363,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:      Maintained
 F:      arch/sparc/
-F:      drivers/sbus
+F:      drivers/sbus/
 
 SPARC SERIAL DRIVERS
 M:      "David S. Miller" <davem@davemloft.net>
@@ -5606,7 +5632,7 @@ L:	tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and us
 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.2.x/tomoyo-lsm/patches/
+T:      quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.3.x/tomoyo-lsm/patches/
 S:      Maintained
 F:      security/tomoyo/
 
@@ -5655,7 +5681,7 @@ TRACING
 M:      Steven Rostedt <rostedt@goodmis.org>
 M:      Frederic Weisbecker <fweisbec@gmail.com>
 M:      Ingo Molnar <mingo@redhat.com>
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core
 S:      Maintained
 F:      Documentation/trace/ftrace.txt
 F:      arch/*/*/*/ftrace.h
@@ -6061,10 +6087,9 @@ F:	Documentation/video4linux/zc0301.txt
 F:      drivers/media/video/zc0301/
 
 USB ZD1201 DRIVER
-M:      Jeroen Vreeken <pe1rxq@amsat.org>
-L:      linux-usb@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 W:      http://linux-lc100020.sourceforge.net
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/zd1201.*
 
 USB ZR364XX DRIVER
@@ -6252,14 +6277,6 @@ F:	Documentation/watchdog/
 F:      drivers/watchdog/
 F:      include/linux/watchdog.h
 
-WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
-M:      Jean Tourrilhes <jt@hpl.hp.com>
-L:      linux-wireless@vger.kernel.org
-W:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-S:      Maintained
-F:      Documentation/networking/wavelan.txt
-F:      drivers/staging/wavelan/
-
 WD7000 SCSI DRIVER
 M:      Miroslav Zagorac <zaga@fly.cc.fer.hr>
 L:      linux-scsi@vger.kernel.org