Merge branch 'for-queue' of https://github.com/agraf/linux-2.6 into queue
* 'for-queue' of https://github.com/agraf/linux-2.6:
PPC: ePAPR: Convert hcall header to uapi (round 2)
KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte()
KVM: PPC: Book3S HV: Allow DTL to be set to address 0, length 0
KVM: PPC: Book3S HV: Fix accounting of stolen time
KVM: PPC: Book3S HV: Run virtual core whenever any vcpus in it can run
KVM: PPC: Book3S HV: Fixes for late-joining threads
KVM: PPC: Book3s HV: Don't access runnable threads list without vcore lock
KVM: PPC: Book3S HV: Fix some races in starting secondary threads
KVM: PPC: Book3S HV: Allow KVM guests to stop secondary threads coming online
PPC: ePAPR: Convert header to uapi
KVM: PPC: Move mtspr/mfspr emulation into own functions
KVM: Documentation: Fix reentry-to-be-consistent paragraph
KVM: PPC: 44x: fix DCR read/write
diff --git a/MAINTAINERS b/MAINTAINERS
index 1fa9074..4376c52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4242,10 +4242,10 @@
F: virt/kvm/
KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
-M: Joerg Roedel <joerg.roedel@amd.com>
+M: Joerg Roedel <joro@8bytes.org>
L: kvm@vger.kernel.org
W: http://kvm.qumranet.com
-S: Supported
+S: Maintained
F: arch/x86/include/asm/svm.h
F: arch/x86/kvm/svm.c