1 files changed, 104 insertions, 109 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 69aa8fe060b3..1a1c27b9c557 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -161,7 +161,7 @@ M:	Greg Kroah-Hartman <gregkh@suse.de>
 L:      linux-serial@vger.kernel.org
 W:      http://serial.sourceforge.net
 S:      Maintained
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 F:      drivers/serial/8250*
 F:      include/linux/serial_8250.h
 
@@ -243,21 +243,6 @@ F:	drivers/pnp/pnpacpi/
 F:      include/linux/acpi.h
 F:      include/acpi/
 
-ACPI BATTERY DRIVERS
-M:      Alexey Starikovskiy <astarikovskiy@suse.de>
-L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
-S:      Supported
-F:      drivers/acpi/battery.c
-F:      drivers/acpi/*sbs*
-
-ACPI EC DRIVER
-M:      Alexey Starikovskiy <astarikovskiy@suse.de>
-L:      linux-acpi@vger.kernel.org
-W:      http://www.lesswatts.org/projects/acpi/
-S:      Supported
-F:      drivers/acpi/ec.c
-
 ACPI FAN DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
 L:      linux-acpi@vger.kernel.org
@@ -447,7 +432,7 @@ AMS (Apple Motion Sensor) DRIVER
 M:      Stelian Pop <stelian@popies.net>
 M:      Michael Hanselmann <linux-kernel@hansmi.ch>
 S:      Supported
-F:      drivers/hwmon/ams/
+F:      drivers/macintosh/ams/
 
 AMSO1100 RNIC DRIVER
 M:      Tom Tucker <tom@opengridcomputing.com>
@@ -657,7 +642,7 @@ ARM/FARADAY FA526 PORT
 M:      Hans Ulli Kroll <ulli.kroll@googlemail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-T:      git://git.berlios.de/gemini-board
+T:      git git://git.berlios.de/gemini-board
 F:      arch/arm/mm/*-fa*
 
 ARM/FOOTBRIDGE ARCHITECTURE
@@ -672,7 +657,7 @@ ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 M:      Sascha Hauer <kernel@pengutronix.de>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-T:      git://git.pengutronix.de/git/imx/linux-2.6.git
+T:      git git://git.pengutronix.de/git/imx/linux-2.6.git
 F:      arch/arm/mach-mx*/
 F:      arch/arm/plat-mxc/
 
@@ -710,8 +695,7 @@ ARM/INCOME PXA270 SUPPORT
 M:      Marek Vasut <marek.vasut@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-F:      arch/arm/mach-pxa/income.c
-F:      arch/arm/mach-pxa/include/mach-pxa/income.h
+F:      arch/arm/mach-pxa/colibri-pxa270-income.c
 
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
@@ -758,13 +742,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-ixp4xx/
 
-ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
-M:      Jonathan Cameron <jic23@cam.ac.uk>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      arch/arm/mach-pxa/imote2.c
-
-ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+ARM/INTEL RESEARCH IMOTE/STARGATE 2 MACHINE SUPPORT
 M:      Jonathan Cameron <jic23@cam.ac.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -929,40 +907,20 @@ W:	http://www.fluff.org/ben/linux/
 S:      Maintained
 F:      arch/arm/mach-s3c2410/
 
-ARM/S3C2440 ARM ARCHITECTURE
+ARM/S3C244x ARM ARCHITECTURE
 M:      Ben Dooks <ben-linux@fluff.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.fluff.org/ben/linux/
 S:      Maintained
 F:      arch/arm/mach-s3c2440/
-
-ARM/S3C2442 ARM ARCHITECTURE
-M:      Ben Dooks <ben-linux@fluff.org>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:      http://www.fluff.org/ben/linux/
-S:      Maintained
-F:      arch/arm/mach-s3c2442/
-
-ARM/S3C2443 ARM ARCHITECTURE
-M:      Ben Dooks <ben-linux@fluff.org>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:      http://www.fluff.org/ben/linux/
-S:      Maintained
 F:      arch/arm/mach-s3c2443/
 
-ARM/S3C6400 ARM ARCHITECTURE
-M:      Ben Dooks <ben-linux@fluff.org>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:      http://www.fluff.org/ben/linux/
-S:      Maintained
-F:      arch/arm/mach-s3c6400/
-
-ARM/S3C6410 ARM ARCHITECTURE
+ARM/S3C64xx ARM ARCHITECTURE
 M:      Ben Dooks <ben-linux@fluff.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.fluff.org/ben/linux/
 S:      Maintained
-F:      arch/arm/mach-s3c6410/
+F:      arch/arm/mach-s3c64xx/
 
 ARM/S5P ARM ARCHITECTURES
 M:      Kukjin Kim <kgene.kim@samsung.com>
@@ -987,7 +945,7 @@ M:	Magnus Damm <magnus.damm@gmail.com>
 L:      linux-sh@vger.kernel.org
 W:      http://oss.renesas.com
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest
 S:      Supported
 F:      arch/arm/mach-shmobile/
 F:      drivers/sh/
@@ -1401,7 +1359,7 @@ F:	include/net/bluetooth/
 
 BONDING DRIVER
 M:      Jay Vosburgh <fubar@us.ibm.com>
-L:      bonding-devel@lists.sourceforge.net
+L:      netdev@vger.kernel.org
 W:      http://sourceforge.net/projects/bonding/
 S:      Supported
 F:      drivers/net/bonding/
@@ -1433,6 +1391,14 @@ L:	netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/tg3.*
 
+BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
+M:      Brett Rudley <brudley@broadcom.com>
+M:      Henry Ptasinski <henryp@broadcom.com>
+M:      Nohee Ko <noheek@broadcom.com>
+L:      linux-wireless@vger.kernel.org
+S:      Supported
+F:      drivers/staging/brcm80211/
+
 BROCADE BFA FC SCSI DRIVER
 M:      Jing Huang <huangj@brocade.com>
 L:      linux-scsi@vger.kernel.org
@@ -1562,9 +1528,8 @@ F:	net/ceph
 F:      include/linux/ceph
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
-M:      David Vrabel <david.vrabel@csr.com>
 L:      linux-usb@vger.kernel.org
-S:      Supported
+S:      Orphan
 F:      Documentation/usb/WUSB-Design-overview.txt
 F:      Documentation/usb/wusb-cbaf
 F:      drivers/usb/host/hwa-hc.c
@@ -1648,7 +1613,7 @@ F:	drivers/platform/x86/classmate-laptop.c
 COCCINELLE/Semantic Patches (SmPL)
 M:      Julia Lawall <julia@diku.dk>
 M:      Gilles Muller <Gilles.Muller@lip6.fr>
-M:      Nicolas Palix <npalix@diku.dk>
+M:      Nicolas Palix <npalix.work@gmail.com>
 L:      cocci@diku.dk (moderated for non-subscribers)
 W:      http://coccinelle.lip6.fr/
 S:      Supported
@@ -1792,6 +1757,7 @@ L:	linux-cris-kernel@axis.com
 W:      http://developer.axis.com
 S:      Maintained
 F:      arch/cris/
+F:      drivers/serial/crisv10.*
 
 CRYPTO API
 M:      Herbert Xu <herbert@gondor.apana.org.au>
@@ -1863,6 +1829,13 @@ W:	http://www.chelsio.com
 S:      Supported
 F:      drivers/net/cxgb4vf/
 
+STMMAC ETHERNET DRIVER
+M:      Giuseppe Cavallaro <peppe.cavallaro@st.com>
+L:      netdev@vger.kernel.org
+W:      http://www.stlinux.com
+S:      Supported
+F:      drivers/net/stmmac/
+
 CYBERPRO FB DRIVER
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -2042,6 +2015,7 @@ F:	drivers/hwmon/dme1737.c
 DOCBOOK FOR DOCUMENTATION
 M:      Randy Dunlap <rdunlap@xenotime.net>
 S:      Maintained
+F:      scripts/kernel-doc
 
 DOCKING STATION DRIVER
 M:      Shaohua Li <shaohua.li@intel.com>
@@ -2052,6 +2026,7 @@ F:	drivers/acpi/dock.c
 DOCUMENTATION
 M:      Randy Dunlap <rdunlap@xenotime.net>
 L:      linux-doc@vger.kernel.org
+T:      quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/
 S:      Maintained
 F:      Documentation/
 
@@ -2085,7 +2060,7 @@ F:	Documentation/blockdev/drbd/
 
 DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
 M:      Greg Kroah-Hartman <gregkh@suse.de>
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
 S:      Supported
 F:      Documentation/kobject.txt
 F:      drivers/base/
@@ -2103,6 +2078,15 @@ S:	Maintained
 F:      drivers/gpu/drm/
 F:      include/drm/
 
+INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
+M:      Chris Wilson <chris@chris-wilson.co.uk>
+L:      intel-gfx@lists.freedesktop.org (subscribers-only)
+L:      dri-devel@lists.freedesktop.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel.git
+S:      Supported
+F:      drivers/gpu/drm/i915
+F:      include/drm/i915*
+
 DSCC4 DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
 L:      netdev@vger.kernel.org
@@ -2460,9 +2444,12 @@ F:	drivers/net/wan/sdla.c
 FRAMEBUFFER LAYER
 L:      linux-fbdev@vger.kernel.org
 W:      http://linux-fbdev.sourceforge.net/
+Q:      http://patchwork.kernel.org/project/linux-fbdev/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
 S:      Orphan
 F:      Documentation/fb/
-F:      drivers/video/fb*
+F:      drivers/video/
+F:      include/video/
 F:      include/linux/fb.h
 
 FREESCALE DMA DRIVER
@@ -2646,10 +2633,10 @@ F:	drivers/net/greth*
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:      Frank Seidel <frank@f-seidel.de>
-L:      lm-sensors@lm-sensors.org
+L:      platform-driver-x86@vger.kernel.org
 W:      http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
 S:      Maintained
-F:      drivers/hwmon/hdaps.c
+F:      drivers/platform/x86/hdaps.c
 
 HWPOISON MEMORY FAILURE HANDLING
 M:      Andi Kleen <andi@firstfloor.org>
@@ -3016,7 +3003,7 @@ M:	Roland Dreier <rolandd@cisco.com>
 M:      Sean Hefty <sean.hefty@intel.com>
 M:      Hal Rosenstock <hal.rosenstock@gmail.com>
 L:      linux-rdma@vger.kernel.org
-W:      http://www.openib.org/
+W:      http://www.openfabrics.org/
 Q:      http://patchwork.kernel.org/project/linux-rdma/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
 S:      Supported
@@ -3417,8 +3404,8 @@ F:	Documentation/kdump/
 KERNEL AUTOMOUNTER (AUTOFS)
 M:      "H. Peter Anvin" <hpa@zytor.com>
 L:      autofs@linux.kernel.org
-S:      Odd Fixes
-F:      fs/autofs/
+S:      Obsolete
+F:      drivers/staging/autofs/
 
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:      Ian Kent <raven@themaw.net>
@@ -3766,6 +3753,13 @@ L:	linux-scsi@vger.kernel.org
 S:      Maintained
 F:      drivers/scsi/sym53c8xx_2/
 
+LTC4261 HARDWARE MONITOR DRIVER
+M:      Guenter Roeck <linux@roeck-us.net>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/ltc4261
+F:      drivers/hwmon/ltc4261.c
+
 LTP (Linux Test Project)
 M:      Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
 M:      Garrett Cooper <yanegomi@gmail.com>
@@ -3861,7 +3855,7 @@ F:	drivers/net/wireless/mwl8k.c
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:      Nicolas Pitre <nico@fluxnic.net>
 S:      Odd Fixes
-F: drivers/mmc/host/mvsdio.*
+F:      drivers/mmc/host/mvsdio.*
 
 MARVELL YUKON / SYSKONNECT DRIVER
 M:      Mirko Lindner <mlindner@syskonnect.de>
@@ -4070,9 +4064,8 @@ F:	drivers/scsi/NCR_D700.*
 
 NETEFFECT IWARP RNIC DRIVER (IW_NES)
 M:      Faisal Latif <faisal.latif@intel.com>
-M:      Chien Tung <chien.tin.tung@intel.com>
 L:      linux-rdma@vger.kernel.org
-W:      http://www.neteffect.com
+W:      http://www.intel.com/Products/Server/Adapters/Server-Cluster/Server-Cluster-overview.htm
 S:      Supported
 F:      drivers/infiniband/hw/nes/
 
@@ -4475,7 +4468,7 @@ L:	platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/panasonic-laptop.c
 
-PANASONIC MN10300/AM33 PORT
+PANASONIC MN10300/AM33/AM34 PORT
 M:      David Howells <dhowells@redhat.com>
 M:      Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
 L:      linux-am33-list@redhat.com (moderated for non-subscribers)
@@ -4952,7 +4945,7 @@ RCUTORTURE MODULE
 M:      Josh Triplett <josh@freedesktop.org>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 S:      Supported
-T:      git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 F:      Documentation/RCU/torture.txt
 F:      kernel/rcutorture.c
 
@@ -4977,7 +4970,7 @@ M:	Dipankar Sarma <dipankar@in.ibm.com>
 M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 W:      http://www.rdrop.com/users/paulmck/rclock/
 S:      Supported
-T:      git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 F:      Documentation/RCU/
 F:      include/linux/rcu*
 F:      include/linux/srcu*
@@ -5167,6 +5160,16 @@ W:	http://www.kernel.dk
 S:      Maintained
 F:      drivers/scsi/sr*
 
+SCSI RDMA PROTOCOL (SRP) INITIATOR
+M:      David Dillow <dillowda@ornl.gov>
+L:      linux-rdma@vger.kernel.org
+S:      Supported
+W:      http://www.openfabrics.org
+Q:      http://patchwork.kernel.org/project/linux-rdma/list/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/dad/srp-initiator.git
+F:      drivers/infiniband/ulp/srp/
+F:      include/scsi/srp.h
+
 SCSI SG DRIVER
 M:      Doug Gilbert <dgilbert@interlog.com>
 L:      linux-scsi@vger.kernel.org
@@ -5389,8 +5392,8 @@ F:	drivers/*/*s3c2410*
 F:      drivers/*/*/*s3c2410*
 
 TI DAVINCI MACHINE SUPPORT
-P:      Kevin Hilman
-M:      davinci-linux-open-source@linux.davincidsp.com
+M:      Kevin Hilman <khilman@deeprootsystems.com>
+L:      davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 Q:      http://patchwork.kernel.org/project/linux-davinci/list/
 S:      Supported
 F:      arch/arm/mach-davinci
@@ -5684,7 +5687,7 @@ S:	Maintained
 
 STAGING SUBSYSTEM
 M:      Greg Kroah-Hartman <gregkh@suse.de>
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
 L:      devel@driverdev.osuosl.org
 S:      Maintained
 F:      drivers/staging/
@@ -5713,7 +5716,7 @@ M:	Paul Mundt <lethal@linux-sh.org>
 L:      linux-sh@vger.kernel.org
 W:      http://www.linux-sh.org
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest
 S:      Supported
 F:      Documentation/sh/
 F:      arch/sh/
@@ -5835,6 +5838,8 @@ M:	Chris Metcalf <cmetcalf@tilera.com>
 W:      http://www.tilera.com/scm/
 S:      Supported
 F:      arch/tile/
+F:      drivers/char/hvc_tile.c
+F:      drivers/net/tile/
 
 TLAN NETWORK DRIVER
 M:      Samuel Chessman <chessman@tux.org>
@@ -5918,7 +5923,7 @@ S:	Maintained
 TTY LAYER
 M:      Greg Kroah-Hartman <gregkh@suse.de>
 S:      Maintained
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 F:      drivers/char/tty_*
 F:      drivers/serial/serial_core.c
 F:      include/linux/serial_core.h
@@ -5991,13 +5996,9 @@ F:	Documentation/filesystems/ufs.txt
 F:      fs/ufs/
 
 ULTRA-WIDEBAND (UWB) SUBSYSTEM:
-M:      David Vrabel <david.vrabel@csr.com>
 L:      linux-usb@vger.kernel.org
-S:      Supported
+S:      Orphan
 F:      drivers/uwb/
-X:      drivers/uwb/wlp/
-X:      drivers/uwb/i1480/i1480u-wlp/
-X:      drivers/uwb/i1480/i1480-wlp.h
 F:      include/linux/uwb.h
 F:      include/linux/uwb/
 
@@ -6139,13 +6140,6 @@ L:	linux-usb@vger.kernel.org
 S:      Maintained
 F:      drivers/usb/serial/option.c
 
-USB OV511 DRIVER
-M:      Mark McClelland <mmcclell@bigfoot.com>
-L:      linux-usb@vger.kernel.org
-W:      http://alpha.dyndns.org/ov511/
-S:      Maintained
-F:      drivers/media/video/ov511.*
-
 USB PEGASUS DRIVER
 M:      Petko Manolov <petkan@users.sourceforge.net>
 L:      linux-usb@vger.kernel.org
@@ -6252,7 +6246,7 @@ USB SUBSYSTEM
 M:      Greg Kroah-Hartman <gregkh@suse.de>
 L:      linux-usb@vger.kernel.org
 W:      http://www.linux-usb.org
-T:      quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
 S:      Supported
 F:      Documentation/usb/
 F:      drivers/net/usb/
@@ -6306,16 +6300,6 @@ S:	Supported
 F:      drivers/usb/host/xhci*
 F:      drivers/usb/host/pci-quirks*
 
-USB ZC0301 DRIVER
-M:      Luca Risolia <luca.risolia@studio.unibo.it>
-L:      linux-usb@vger.kernel.org
-L:      linux-media@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-W:      http://www.linux-projects.org
-S:      Maintained
-F:      Documentation/video4linux/zc0301.txt
-F:      drivers/media/video/zc0301/
-
 USB ZD1201 DRIVER
 L:      linux-wireless@vger.kernel.org
 W:      http://linux-lc100020.sourceforge.net
@@ -6495,6 +6479,12 @@ S:	Maintained
 F:      Documentation/hwmon/w83793
 F:      drivers/hwmon/w83793.c
 
+W83795 HARDWARE MONITORING DRIVER
+M:      Jean Delvare <khali@linux-fr.org>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      drivers/hwmon/w83795.c
+
 W83L51xD SD/MMC CARD INTERFACE DRIVER
 M:      Pierre Ossman <pierre@ossman.eu>
 S:      Maintained
@@ -6533,15 +6523,6 @@ F:	include/linux/wimax/debug.h
 F:      include/net/wimax.h
 F:      net/wimax/
 
-WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
-M:      David Vrabel <david.vrabel@csr.com>
-L:      netdev@vger.kernel.org
-S:      Maintained
-F:      include/linux/wlp.h
-F:      drivers/uwb/wlp/
-F:      drivers/uwb/i1480/i1480u-wlp/
-F:      drivers/uwb/i1480/i1480-wlp.h
-
 WISTRON LAPTOP BUTTON DRIVER
 M:      Miloslav Trmac <mitr@volny.cz>
 S:      Maintained
@@ -6628,11 +6609,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 (moderated for non-subscribers)
+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 (moderated for non-subscribers)
+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.xensource.com (moderated for non-subscribers)
 L:      virtualization@lists.osdl.org
-L:      xen-devel@lists.xensource.com
 S:      Supported
 F:      arch/x86/xen/
 F:      drivers/*/xen-*front.c