diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-11 00:38:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-11 11:28:22 +0100 |
| commit | aea5b31b7df7526dcb07000a50d35f3df3e6c283 (patch) | |
| tree | c5f02bbdfac69a0165a3f366dc8f1a85ed459d3f /MAINTAINERS | |
| parent | 1ab056a5fb0d123436b862806734c6a9dc4651a4 (diff) | |
| parent | 2606d2448703e8995ca39a59d8a1106a1e0f034a (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/kvm' into linux-linaro-lsk
Conflicts:
arch/arm/kvm/arm.c
arch/arm64/Makefile
arch/arm64/kernel/asm-offsets.c
virt/kvm/kvm_main.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b4f332475b73..7433b84439f3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4719,6 +4719,15 @@ F: arch/arm/include/uapi/asm/kvm* F: arch/arm/include/asm/kvm* F: arch/arm/kvm/ +KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64) +M: Marc Zyngier <marc.zyngier@arm.com> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +L: kvmarm@lists.cs.columbia.edu +S: Maintained +F: arch/arm64/include/uapi/asm/kvm* +F: arch/arm64/include/asm/kvm* +F: arch/arm64/kvm/ + KEXEC M: Eric Biederman <ebiederm@xmission.com> W: http://kernel.org/pub/linux/utils/kernel/kexec/ |