diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 15:01:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-06 15:01:52 +0100 |
| commit | c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2 (patch) | |
| tree | 00aff822e9208ab2f2ac41c6e1a0f61c6eb9b57f /MAINTAINERS | |
| parent | 1e1851f9d725ff9f00d74dfc4b73d47cba57466f (diff) | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| download | linux-c39b7eef7d92f5ffef1abf04227a62fa2a6a62b2.tar.gz | |
Merge 4.3-rc4 into char-misc-next
This is needed due to the duplicated iommu stuff to help with the merge
and to prevent future issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 35d7c6f5c29a..73a66edfd29f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5963,7 +5963,7 @@ F: virt/kvm/ KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V M: Joerg Roedel <joro@8bytes.org> L: kvm@vger.kernel.org -W: http://kvm.qumranet.com +W: http://www.linux-kvm.org/ S: Maintained F: arch/x86/include/asm/svm.h F: arch/x86/kvm/svm.c @@ -5971,7 +5971,7 @@ F: arch/x86/kvm/svm.c KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC M: Alexander Graf <agraf@suse.com> L: kvm-ppc@vger.kernel.org -W: http://kvm.qumranet.com +W: http://www.linux-kvm.org/ T: git git://github.com/agraf/linux-2.6.git S: Supported F: arch/powerpc/include/asm/kvm* |