Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domain-v6

1 files changed, 23 insertions, 3 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7679bf32f7bb..30b3e163cd10 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3239,6 +3239,12 @@ F:	drivers/net/irda/
 F:      include/net/irda/
 F:      net/irda/
 
+IRQ SUBSYSTEM
+M:      Thomas Gleixner <tglx@linutronix.de>
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core
+F:      kernel/irq/
+
 ISAPNP
 M:      Jaroslav Kysela <perex@perex.cz>
 S:      Maintained
@@ -6522,11 +6528,25 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.
 S:      Maintained
 F:      drivers/platform/x86
 
+XEN PCI SUBSYSTEM
+M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:      xen-devel@lists.xensource.com
+S:      Supported
+F:      arch/x86/pci/*xen*
+F:      drivers/pci/*xen*
+
+XEN SWIOTLB SUBSYSTEM
+M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:      xen-devel@lists.xensource.com
+S:      Supported
+F:      arch/x86/xen/*swiotlb*
+F:      drivers/xen/*swiotlb*
+
 XEN HYPERVISOR INTERFACE
-M:      Jeremy Fitzhardinge <jeremy@xensource.com>
-M:      Chris Wright <chrisw@sous-sol.org>
+M:      Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
+M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:      xen-devel@lists.xen.org
 L:      virtualization@lists.osdl.org
-L:      xen-devel@lists.xensource.com
 S:      Supported
 F:      arch/x86/xen/
 F:      drivers/*/xen-*front.c