aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS1
-rw-r--r--MAINTAINERS1
2 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 206d0fcf07a5..646a0a9ad6d1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1120,6 +1120,7 @@ D: author of userfs filesystem
1120D: Improved mmap and munmap handling 1120D: Improved mmap and munmap handling
1121D: General mm minor tidyups 1121D: General mm minor tidyups
1122D: autofs v4 maintainer 1122D: autofs v4 maintainer
1123D: Xen subsystem
1123S: 987 Alabama St 1124S: 987 Alabama St
1124S: San Francisco 1125S: San Francisco
1125S: CA, 94110 1126S: CA, 94110
diff --git a/MAINTAINERS b/MAINTAINERS
index a97428fa98b5..0161dade7436 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9237,7 +9237,6 @@ F: drivers/media/tuners/tuner-xc2028.*
9237 9237
9238XEN HYPERVISOR INTERFACE 9238XEN HYPERVISOR INTERFACE
9239M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 9239M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
9240M: Jeremy Fitzhardinge <jeremy@goop.org>
9241M: Boris Ostrovsky <boris.ostrovsky@oracle.com> 9240M: Boris Ostrovsky <boris.ostrovsky@oracle.com>
9242M: David Vrabel <david.vrabel@citrix.com> 9241M: David Vrabel <david.vrabel@citrix.com>
9243L: xen-devel@lists.xenproject.org (moderated for non-subscribers) 9242L: xen-devel@lists.xenproject.org (moderated for non-subscribers)