6pack,mkiss: fix lock inconsistency

[linux-imx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 58848125b8bfadcc70f9b37ac68d77d6aee0794b..d0cdb2f944da8435005027bf17d4317135fbbeb4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3444,6 +3444,12 @@ F:       drivers/lguest/
 F:     include/linux/lguest*.h
 F:     arch/x86/include/asm/lguest*.h
 
+LINUX 2.6.35 LONGTERM:
+M:     Andi Kleen <andi@firstfloor.org>
+L:     stable@kernel.org
+S:     Maintained
+F:     *
+
 LINUX FOR IBM pSERIES (RS/6000)
 M:     Paul Mackerras <paulus@au.ibm.com>
 W:     http://www.ibm.com/linux/ltc/projects/ppc
@@ -5336,6 +5342,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
 
 SPARC SERIAL DRIVERS
 M:     "David S. Miller" <davem@davemloft.net>
@@ -5441,7 +5448,6 @@ F:        arch/alpha/kernel/srm_env.c
 
 STABLE BRANCH
 M:     Greg Kroah-Hartman <greg@kroah.com>
-M:     Chris Wright <chrisw@sous-sol.org>
 L:     stable@kernel.org
 S:     Maintained
 
@@ -6242,6 +6248,8 @@ F:        drivers/mmc/host/wbsd.*
 
 WATCHDOG DEVICE DRIVERS
 M:     Wim Van Sebroeck <wim@iguana.be>
+L:     linux-watchdog@vger.kernel.org
+W:     http://www.linux-watchdog.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
 S:     Maintained
 F:     Documentation/watchdog/