ftrace: remove mcount set

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 57975bd..5c3f79c 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
@@ -2448,7 +2448,14 @@ S:       Supported
 
 KERNEL VIRTUAL MACHINE (KVM)
 P:     Avi Kivity
-M:     avi@qumranet.com
+M:     avi@redhat.com
+L:     kvm@vger.kernel.org
+W:     http://kvm.qumranet.com
+S:     Supported
+
+KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
+P:     Joerg Roedel
+M:     joerg.roedel@amd.com
 L:     kvm@vger.kernel.org
 W:     http://kvm.qumranet.com
 S:     Supported
@@ -3930,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
@@ -3938,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