summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-02-04 14:50:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-02-04 14:50:07 +0000
commit9cb543124a2d31af42ce61a4c30765ecc8e5f1fa (patch)
tree9ac55de78161c7eb323e7358b37d9617beb4e018 /MAINTAINERS
parent6629096a5eb861b6d91fe9c2204414d9b072d161 (diff)
parentda141b67d29a05267a9a0d56bd7856b7f3f58d44 (diff)
downloadlinux-9cb543124a2d31af42ce61a4c30765ecc8e5f1fa.tar.bz2
Merge branch 'for-rmk/virt/kvm/core' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3105c4868c4e..845becb8d6ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4481,6 +4481,15 @@ F: arch/s390/include/asm/kvm*
F: arch/s390/kvm/
F: drivers/s390/kvm/
+KERNEL VIRTUAL MACHINE (KVM) FOR ARM
+M: Christoffer Dall <cdall@cs.columbia.edu>
+L: kvmarm@lists.cs.columbia.edu
+W: http://systems.cs.columbia.edu/projects/kvm-arm
+S: Maintained
+F: arch/arm/include/uapi/asm/kvm*
+F: arch/arm/include/asm/kvm*
+F: arch/arm/kvm/
+
KEXEC
M: Eric Biederman <ebiederm@xmission.com>
W: http://kernel.org/pub/linux/utils/kernel/kexec/