PCI hotplug: fix logic in Compaq hotplug controller bus speed setup

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 52702b057c022fa6a3d3b4ee7f2c5984482286f9..4b41eb61a04d22626b6d12b58c01fd3d32336b4e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1198,7 +1198,7 @@ S:        Maintained
 
 CPU FREQUENCY DRIVERS
 P:     Dave Jones
-M:     davej@codemonkey.org.uk
+M:     davej@redhat.com
 L:     cpufreq@vger.kernel.org
 W:     http://www.codemonkey.org.uk/projects/cpufreq/
 T:     git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
@@ -3244,11 +3244,6 @@ L:       linux-pci@vger.kernel.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 S:     Supported
 
-PCI HOTPLUG CORE
-P:     Kristen Carlson Accardi
-M:     kristen.c.accardi@intel.com
-S:     Supported
-
 PCIE HOTPLUG DRIVER
 P:     Kristen Carlson Accardi
 M:     kristen.c.accardi@intel.com
@@ -3937,7 +3932,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 +3940,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