Merge branch 'for-linus' of git://www.jni.nu/cris

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

diff --git a/MAINTAINERS b/MAINTAINERS
index df20e29c7937e107ee1ddaa66a4c49c5f030e2ef..52702b057c022fa6a3d3b4ee7f2c5984482286f9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -4618,7 +4625,7 @@ WM97XX TOUCHSCREEN DRIVERS
 P:     Mark Brown
 M:     broonie@opensource.wolfsonmicro.com
 P:     Liam Girdwood
-M:     liam.girdwood@wolfsonmicro.com
+M:     lrg@slimlogic.co.uk
 L:     linux-input@vger.kernel.org
 T:     git git://opensource.wolfsonmicro.com/linux-2.6-touch
 W:     http://opensource.wolfsonmicro.com/node/7