diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-18 13:55:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-18 13:55:36 +1100 |
| commit | b1b5bb8a5db9cf0b5a06fe3aab735a602285bf3b (patch) | |
| tree | 33477f0de312551acb0c95a18147fa2eaefd5468 /MAINTAINERS | |
| parent | 0f8cb457c5f001085fead6058473e2ac50719fe9 (diff) | |
| parent | 8863dbd3652ba2f97b157c21c41650de6fbc4d12 (diff) | |
Merge commit 'kvm/master'
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2b62b0fe89b9..68a90a7cb2ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2536,8 +2536,6 @@ W: http://kvm.qumranet.com S: Supported KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64) -P: Anthony Xu -M: anthony.xu@intel.com P: Xiantao Zhang M: xiantao.zhang@intel.com L: kvm-ia64@vger.kernel.org |