leds/acpi: Fix merge fallout from acpi_driver_data change

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 52702b057c022fa6a3d3b4ee7f2c5984482286f9..355c192d699779f773259ddd647b64d574021cfe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3937,7 +3937,7 @@ M:        jbglaw@lug-owl.de
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
-STABLE BRANCH:
+STABLE BRANCH
 P:     Greg Kroah-Hartman
 M:     greg@kroah.com
 P:     Chris Wright
@@ -3945,6 +3945,13 @@ M:       chrisw@sous-sol.org
 L:     stable@kernel.org
 S:     Maintained
 
+STAGING SUBSYSTEM
+P:     Greg Kroah-Hartman
+M:     gregkh@suse.de
+L:     linux-kernel@vger.kernel.org
+T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+S:     Maintained
+
 STARFIRE/DURALAN NETWORK DRIVER
 P:     Ion Badulescu
 M:     ionut@cs.columbia.edu