diff --git a/[refs] b/[refs] index 86d98f81a00c..8b61d734f727 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa024c2f35a07cc32e48c5f62a5807be01c09249 +refs/heads/master: a749474de5f0f5902f59acb5c7f4dc6b816ac788 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 915564eda145..7a6b9fea7c28 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4474,6 +4474,15 @@ F: arch/s390/include/asm/kvm* F: arch/s390/kvm/ F: drivers/s390/kvm/ +KERNEL VIRTUAL MACHINE (KVM) FOR ARM +M: Christoffer Dall +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 W: http://kernel.org/pub/linux/utils/kernel/kexec/