Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

post 3.2-rc7 pull request

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  MAINTAINERS: firewire git URL update

diff --combined MAINTAINERS
index 6afba60c390488acdfe818b98c823f0921a19749,37deb5eead9f97f7133a36c95440b99f8777b3ba..0e7a80aefa0c27d52e9dec4e2a29d181ff7575ac
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -117,20 -117,20 +117,20 @@@ Maintainers List (try to look for most 
  M:    Philip Blundell <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/3c505*
 +F:    drivers/net/ethernet/i825xx/3c505*
  
  3C59X NETWORK DRIVER
  M:    Steffen Klassert <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/networking/vortex.txt
 -F:    drivers/net/3c59x.c
 +F:    drivers/net/ethernet/3com/3c59x.c
  
  3CR990 NETWORK DRIVER
  M:    David Dillow <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/typhoon*
 +F:    drivers/net/ethernet/3com/typhoon*
  
  3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
  M:    Adam Radford <[email protected]>
@@@ -156,7 -156,7 +156,7 @@@ M: Realtek linux nic maintainers <nic_s
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/r8169.c
 +F:    drivers/net/ethernet/realtek/r8169.c
  
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -170,7 -170,8 +170,7 @@@ F: include/linux/serial_8250.
  8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
  L:    [email protected]
  S:    Orphan / Obsolete
 -F:    drivers/net/*8390*
 -F:    drivers/net/ax88796.c
 +F:    drivers/net/ethernet/8390/
  
  9P FILE SYSTEM
  M:    Eric Van Hensbergen <[email protected]>
@@@ -213,7 -214,7 +213,7 @@@ ACENIC DRIVE
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/acenic*
 +F:    drivers/net/ethernet/alteon/acenic*
  
  ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
  M:    Peter Feuerer <[email protected]>
@@@ -316,10 -317,6 +316,10 @@@ W:       http://wiki.analog.com/AD787
  S:    Supported
  F:    drivers/input/touchscreen/ad7879.c
  
 +ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
 +M:    Jiri Kosina <[email protected]>
 +S:    Maintained
 +
  ADM1025 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -511,8 -508,8 +511,8 @@@ M: Joerg Roedel <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
  S:    Supported
 -F:    arch/x86/kernel/amd_iommu*.c
 -F:    arch/x86/include/asm/amd_iommu*.h
 +F:    drivers/iommu/amd_iommu*.[ch]
 +F:    include/linux/amd-iommu.h
  
  AMD MICROCODE UPDATE SUPPORT
  M:    Andreas Herrmann <[email protected]>
@@@ -533,7 -530,6 +533,7 @@@ S: Maintaine
  F:    drivers/infiniband/hw/amso1100/
  
  ANALOG DEVICES INC ASOC CODEC DRIVERS
 +M:    Lars-Peter Clausen <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://wiki.analog.com/
@@@ -692,12 -688,6 +692,12 @@@ F:       drivers/mtd/nand/bcm_umi_nand.
  F:    drivers/mtd/nand/bcm_umi_bch.c
  F:    drivers/mtd/nand/nand_bcm_umi.h
  
 +ARM/CALXEDA HIGHBANK ARCHITECTURE
 +M:    Rob Herring <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-highbank/
 +
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
  M:    Anton Vorontsov <[email protected]>
  S:    Maintained
@@@ -756,7 -746,7 +756,7 @@@ L: [email protected]
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  F:    arch/arm/mach-ebsa110/
 -F:    drivers/net/arm/am79c961a.*
 +F:    drivers/net/ethernet/amd/am79c961a.*
  
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Daniel Ribeiro <[email protected]>
@@@ -789,7 -779,6 +789,7 @@@ L: [email protected]
  S:    Maintained
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
  F:    arch/arm/mach-mx*/
 +F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
  
  ARM/FREESCALE IMX51
@@@ -798,20 -787,6 +798,20 @@@ L:       [email protected]
  S:    Maintained
  F:    arch/arm/mach-mx5/
  
 +ARM/FREESCALE IMX6
 +M:    Shawn Guo <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 +F:    arch/arm/mach-imx/*imx6*
 +
 +ARM/FREESCALE MXS ARM ARCHITECTURE
 +M:    Shawn Guo <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 +F:    arch/arm/mach-mxs/
 +
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1040,9 -1015,7 +1040,9 @@@ F:      arch/arm/include/asm/hardware/ioc.
  F:    arch/arm/include/asm/hardware/iomd.h
  F:    arch/arm/include/asm/hardware/memc.h
  F:    arch/arm/mach-rpc/
 -F:    drivers/net/arm/ether*
 +F:    drivers/net/ethernet/8390/etherh.c
 +F:    drivers/net/ethernet/i825xx/ether1*
 +F:    drivers/net/ethernet/seeq/ether3*
  F:    drivers/scsi/arm/
  
  ARM/SHARK MACHINE SUPPORT
@@@ -1054,18 -1027,35 +1054,18 @@@ ARM/SAMSUNG ARM ARCHITECTURE
  M:    Ben Dooks <[email protected]>
  M:    Kukjin Kim <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/plat-samsung/
  F:    arch/arm/plat-s3c24xx/
  F:    arch/arm/plat-s5p/
 +F:    arch/arm/mach-s3c24*/
 +F:    arch/arm/mach-s3c64xx/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
 -
 -ARM/S3C2410 ARM ARCHITECTURE
 -M:    Ben Dooks <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
 -S:    Maintained
 -F:    arch/arm/mach-s3c2410/
 -
 -ARM/S3C244x ARM ARCHITECTURE
 -M:    Ben Dooks <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
 -S:    Maintained
 -F:    arch/arm/mach-s3c2440/
 -F:    arch/arm/mach-s3c2443/
 -
 -ARM/S3C64xx ARM ARCHITECTURE
 -M:    Ben Dooks <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
 -S:    Maintained
 -F:    arch/arm/mach-s3c64xx/
 +F:    drivers/spi/spi-s3c*
 +F:    sound/soc/samsung/*
  
  ARM/S5P EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <[email protected]>
@@@ -1094,25 -1084,6 +1094,25 @@@ F:    arch/arm/plat-s5p/dev-fimc
  F:    arch/arm/plat-samsung/include/plat/*fimc*
  F:    drivers/media/video/s5p-fimc/
  
 +ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 +M:    Kyungmin Park <[email protected]>
 +M:    Kamil Debski <[email protected]>
 +M:     Jeongtae Park <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/plat-s5p/dev-mfc.c
 +F:    drivers/media/video/s5p-mfc/
 +
 +ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
 +M:    Kyungmin Park <[email protected]>
 +M:    Tomasz Stanislawski <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/plat-s5p/dev-tv.c
 +F:    drivers/media/video/s5p-tv/
 +
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Paul Mundt <[email protected]>
  M:    Magnus Damm <[email protected]>
@@@ -1156,7 -1127,7 +1156,7 @@@ F:      arch/arm/mach-nuc93x
  F:    drivers/input/keyboard/w90p910_keypad.c
  F:    drivers/input/touchscreen/w90p910_ts.c
  F:    drivers/watchdog/nuc900_wdt.c
 -F:    drivers/net/arm/w90p910_ether.c
 +F:    drivers/net/ethernet/nuvoton/w90p910_ether.c
  F:    drivers/mtd/nand/nuc900_nand.c
  F:    drivers/rtc/rtc-nuc900.c
  F:    drivers/spi/spi_nuc900.c
@@@ -1259,7 -1230,7 +1259,7 @@@ F:      Documentation/aoe
  F:    drivers/block/aoe/
  
  ATHEROS ATH GENERIC UTILITIES
 -M:    "Luis R. Rodriguez" <lrodriguez@atheros.com>
 +M:    "Luis R. Rodriguez" <[email protected].com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/wireless/ath/*
@@@ -1267,7 -1238,7 +1267,7 @@@
  ATHEROS ATH5K WIRELESS DRIVER
  M:    Jiri Slaby <[email protected]>
  M:    Nick Kossifidis <[email protected]>
 -M:    "Luis R. Rodriguez" <lrodriguez@atheros.com>
 +M:    "Luis R. Rodriguez" <[email protected].com>
  M:    Bob Copeland <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -1275,19 -1246,11 +1275,19 @@@ W:   http://wireless.kernel.org/en/users/
  S:    Maintained
  F:    drivers/net/wireless/ath/ath5k/
  
 +ATHEROS ATH6KL WIRELESS DRIVER
 +M:    Kalle Valo <[email protected]>
 +L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git
 +S:    Supported
 +F:    drivers/net/wireless/ath/ath6kl/
 +
  ATHEROS ATH9K WIRELESS DRIVER
 -M:    "Luis R. Rodriguez" <lrodriguez@atheros.com>
 -M:    Jouni Malinen <jmalinen@atheros.com>
 -M:    Vasanthakumar Thiagarajan <vasanth@atheros.com>
 -M:    Senthil Balasubramanian <senthilkumar@atheros.com>
 +M:    "Luis R. Rodriguez" <[email protected].com>
 +M:    Jouni Malinen <j[email protected].com>
 +M:    Vasanthakumar Thiagarajan <v[email protected].com>
 +M:    Senthil Balasubramanian <senthil[email protected].com>
  L:    [email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath9k
@@@ -1315,11 -1278,12 +1315,11 @@@ F:   drivers/input/misc/ati_remote2.
  ATLX ETHERNET DRIVERS
  M:    Jay Cliburn <[email protected]>
  M:    Chris Snook <[email protected]>
 -M:    Jie Yang <[email protected]>
  L:    [email protected]
  W:    http://sourceforge.net/projects/atl1
  W:    http://atl1.sourceforge.net
  S:    Maintained
 -F:    drivers/net/atlx/
 +F:    drivers/net/ethernet/atheros/
  
  ATM
  M:    Chas Williams <[email protected]>
@@@ -1359,7 -1323,7 +1359,7 @@@ F:      include/video/atmel_lcdc.
  ATMEL MACB ETHERNET DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
 -F:    drivers/net/macb.*
 +F:    drivers/net/ethernet/cadence/
  
  ATMEL SPI DRIVER
  M:    Nicolas Ferre <[email protected]>
@@@ -1482,7 -1446,7 +1482,7 @@@ BLACKFIN EMAC DRIVE
  L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
 -F:    drivers/net/bfin_mac.*
 +F:    drivers/net/ethernet/adi/
  
  BLACKFIN RTC DRIVER
  M:    Mike Frysinger <[email protected]>
@@@ -1563,27 -1527,27 +1563,27 @@@ BROADCOM B44 10/100 ETHERNET DRIVE
  M:    Gary Zambrano <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/b44.*
 +F:    drivers/net/ethernet/broadcom/b44.*
  
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/bnx2.*
 -F:    drivers/net/bnx2_*
 +F:    drivers/net/ethernet/broadcom/bnx2.*
 +F:    drivers/net/ethernet/broadcom/bnx2_*
  
  BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
  M:    Eilon Greenstein <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/bnx2x/
 +F:    drivers/net/ethernet/broadcom/bnx2x/
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Matt Carlson <[email protected]>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/tg3.*
 +F:    drivers/net/ethernet/broadcom/tg3.*
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Brett Rudley <[email protected]>
@@@ -1610,9 -1574,10 +1610,9 @@@ F:     drivers/scsi/bfa
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
  M:    Rasesh Mody <[email protected]>
 -M:    Debashis Dutt <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/bna/
 +F:    drivers/net/ethernet/brocade/bna/
  
  BSG (block layer generic sg v4 driver)
  M:    FUJITA Tomonori <[email protected]>
@@@ -1700,7 -1665,7 +1700,7 @@@ CAN NETWORK LAYE
  M:    Oliver Hartkopp <[email protected]>
  M:    Oliver Hartkopp <[email protected]>
  M:    Urs Thuermann <[email protected]>
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  L:    [email protected]
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -1709,11 -1674,10 +1709,11 @@@ F:   include/linux/can.
  F:    include/linux/can/core.h
  F:    include/linux/can/bcm.h
  F:    include/linux/can/raw.h
 +F:    include/linux/can/gw.h
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <[email protected]>
 -L:    [email protected] (subscribers-only)
 +L:    [email protected]
  L:    [email protected]
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -1780,14 -1744,6 +1780,14 @@@ F:    include/net/cfg80211.
  F:    net/wireless/*
  X:    net/wireless/wext*
  
 +CHAR and MISC DRIVERS
 +M:    Arnd Bergmann <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 +S:    Maintained
 +F:    drivers/char/*
 +F:    drivers/misc/*
 +
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
  S:    Supported
@@@ -1802,16 -1758,17 +1802,16 @@@ F:   Documentation/zh_CN
  
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
 -M:    Vasanthy Kolluri <[email protected]>
  M:    Roopa Prabhu <[email protected]>
  M:    David Wang <[email protected]>
  S:    Supported
 -F:    drivers/net/enic/
 +F:    drivers/net/ethernet/cisco/enic/
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/arm/ep93xx_eth.c
 +F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
  
  CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
  M:    Lennert Buytenhek <[email protected]>
@@@ -1926,11 -1883,9 +1926,11 @@@ S:    Maintaine
  F:    drivers/connector/
  
  CONTROL GROUPS (CGROUPS)
 -M:    Paul Menage <paul@paulmenage.org>
 +M:    Tejun Heo <tj@kernel.org>
  M:    Li Zefan <[email protected]>
  L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
  F:    include/linux/cgroup*
  F:    kernel/cgroup*
@@@ -1953,7 -1908,7 +1953,7 @@@ CPMAC ETHERNET DRIVE
  M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/cpmac.c
 +F:    drivers/net/ethernet/ti/cpmac.c
  
  CPU FREQUENCY DRIVERS
  M:    Dave Jones <[email protected]>
@@@ -2040,7 -1995,7 +2040,7 @@@ M:      Divy Le Ray <[email protected]
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
 -F:    drivers/net/cxgb3/
 +F:    drivers/net/ethernet/chelsio/cxgb3/
  
  CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
  M:    Steve Wise <[email protected]>
@@@ -2054,7 -2009,7 +2054,7 @@@ M:      Dimitris Michailidis <[email protected]
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
 -F:    drivers/net/cxgb4/
 +F:    drivers/net/ethernet/chelsio/cxgb4/
  
  CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
  M:    Steve Wise <[email protected]>
@@@ -2068,14 -2023,14 +2068,14 @@@ M:   Casey Leedom <[email protected]
  L:    [email protected]
  W:    http://www.chelsio.com
  S:    Supported
 -F:    drivers/net/cxgb4vf/
 +F:    drivers/net/ethernet/chelsio/cxgb4vf/
  
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <[email protected]>
  L:    [email protected]
  W:    http://www.stlinux.com
  S:    Supported
 -F:    drivers/net/stmmac/
 +F:    drivers/net/ethernet/stmicro/stmmac/
  
  CYBERPRO FB DRIVER
  M:    Russell King <[email protected]>
@@@ -2119,7 -2074,7 +2119,7 @@@ DAVICOM FAST ETHERNET (DMFE) NETWORK DR
  L:    [email protected]
  S:    Orphan
  F:    Documentation/networking/dmfe.txt
 -F:    drivers/net/tulip/dmfe.c
 +F:    drivers/net/ethernet/tulip/dmfe.c
  
  DC390/AM53C974 SCSI driver
  M:    Kurt Garloff <[email protected]>
@@@ -2158,7 -2113,7 +2158,7 @@@ F:      net/decnet
  DEFXX FDDI NETWORK DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>
  S:    Maintained
 -F:    drivers/net/defxx.*
 +F:    drivers/net/fddi/defxx.*
  
  DELL LAPTOP DRIVER
  M:    Matthew Garrett <[email protected]>
@@@ -2184,14 -2139,6 +2184,14 @@@ M:    Matthew Garrett <[email protected]
  S:    Maintained
  F:    drivers/platform/x86/dell-wmi.c
  
 +DESIGNWARE USB3 DRD IP DRIVER
 +M:    Felipe Balbi <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 +S:    Maintained
 +F:    drivers/usb/dwc3/
 +
  DEVICE NUMBER REGISTRY
  M:    Torben Mathiasen <[email protected]>
  W:    http://lanana.org/docs/device-list/index.html
@@@ -2344,25 -2291,12 +2344,25 @@@ S:   Supporte
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
  
 +DRM DRIVERS FOR EXYNOS
 +M:    Inki Dae <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/gpu/drm/exynos
 +F:    include/drm/exynos*
 +
  DSCC4 DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wan/dscc4.c
  
 +DYNAMIC DEBUG
 +M:    Jason Baron <[email protected]>
 +S:    Maintained
 +F:    lib/dynamic_debug.c
 +F:    include/linux/dynamic_debug.h
 +
  DZ DECSTATION DZ11 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>
  S:    Maintained
@@@ -2397,7 -2331,7 +2397,7 @@@ F:      include/linux/netfilter_bridge/ebt_*
  F:    net/bridge/netfilter/ebt*.c
  
  ECRYPT FILE SYSTEM
 -M:    Tyler Hicks <tyhicks@linux.vnet.ibm.com>
 +M:    Tyler Hicks <tyhicks@canonical.com>
  M:    Dustin Kirkland <[email protected]>
  L:    [email protected]
  W:    https://launchpad.net/ecryptfs
@@@ -2478,6 -2412,8 +2478,6 @@@ L:      [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
 -F:    drivers/edac/edac_mce.c
 -F:    include/linux/edac_mce.h
  
  EDAC-I82975X
  M:    Ranganathan Desikan <[email protected]>
@@@ -2501,13 -2437,6 +2501,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
  
 +EDAC-SBRIDGE
 +M:    Mauro Carvalho Chehab <[email protected]>
 +L:    [email protected]
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +F:    drivers/edac/sb_edac.c
 +
  EDIROL UA-101/UA-1000 DRIVER
  M:    Clemens Ladisch <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2534,10 -2463,10 +2534,10 @@@ S:   Supporte
  F:    drivers/infiniband/hw/ehca/
  
  EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 -M:    Breno Leitao <leita[email protected]>
 +M:    Thadeu Lima de Souza Cascardo <cascard[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ehea/
 +F:    drivers/net/ethernet/ibm/ehea/
  
  EMBEDDED LINUX
  M:    Paul Gortmaker <[email protected]>
@@@ -2582,10 -2511,10 +2582,10 @@@ ETHEREXPRESS-16 NETWORK DRIVE
  M:    Philip Blundell <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/eexpress.*
 +F:    drivers/net/ethernet/i825xx/eexpress.*
  
  ETHERNET BRIDGE
 -M:    Stephen Hemminger <shemminger@linux-foundation.org>
 +M:    Stephen Hemminger <shemminger@vyatta.com>
  L:    [email protected]
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net:Bridge
@@@ -2596,7 -2525,7 +2596,7 @@@ F:      net/bridge
  ETHERTEAM 16I DRIVER
  M:    Mika Kuoppala <[email protected]>
  S:    Maintained
 -F:    drivers/net/eth16i.c
 +F:    drivers/net/ethernet/fujitsu/eth16i.c
  
  EXT2 FILE SYSTEM
  M:    Jan Kara <[email protected]>
@@@ -2626,11 -2555,6 +2626,11 @@@ S:    Maintaine
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
  
 +Extended Verification Module (EVM)
 +M:    Mimi Zohar <[email protected]>
 +S:    Supported
 +F:    security/integrity/evm/
 +
  F71805F HARDWARE MONITORING DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -2700,7 -2624,7 +2700,7 @@@ FIREWIRE SUBSYSTE
  M:    Stefan Richter <[email protected]>
  L:    [email protected]
  W:    http://ieee1394.wiki.kernel.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
  S:    Maintained
  F:    drivers/firewire/
  F:    include/linux/firewire*.h
@@@ -2765,7 -2689,7 +2765,7 @@@ M:      Vitaly Bordug <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/fs_enet/
 +F:    drivers/net/ethernet/freescale/fs_enet/
  F:    include/linux/fs_enet_pd.h
  
  FREESCALE QUICC ENGINE LIBRARY
@@@ -2787,7 -2711,7 +2787,7 @@@ M:      Li Yang <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ucc_geth*
 +F:    drivers/net/ethernet/freescale/ucc_geth*
  
  FREESCALE QUICC ENGINE UCC UART DRIVER
  M:    Timur Tabi <[email protected]>
@@@ -2812,7 -2736,7 +2812,7 @@@ F:      fs/freevxfs
  FREEZER
  M:    Pavel Machek <[email protected]>
  M:    "Rafael J. Wysocki" <[email protected]>
 -L:    linux-pm@lists.linux-foundation.org
 +L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    Documentation/power/freezing-of-tasks.txt
  F:    include/linux/freezer.h
@@@ -3029,13 -2953,6 +3029,13 @@@ F:    Documentation/hw_random.tx
  F:    drivers/char/hw_random/
  F:    include/linux/hw_random.h
  
 +HARDWARE SPINLOCK CORE
 +M:    Ohad Ben-Cohen <[email protected]>
 +S:    Maintained
 +F:    Documentation/hwspinlock.txt
 +F:    drivers/hwspinlock/hwspinlock_*
 +F:    include/linux/hwspinlock.h
 +
  HARMONY SOUND DRIVER
  M:    Kyle McMartin <[email protected]>
  L:    [email protected]
@@@ -3081,7 -2998,7 +3081,7 @@@ F:      drivers/video/hgafb.
  HIBERNATION (aka Software Suspend, aka swsusp)
  M:    Pavel Machek <[email protected]>
  M:    "Rafael J. Wysocki" <[email protected]>
 -L:    linux-pm@lists.linux-foundation.org
 +L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    arch/x86/power/
  F:    drivers/base/power/
@@@ -3101,7 -3018,6 +3101,7 @@@ F:      include/linux/hid
  
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  M:    Thomas Gleixner <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Maintained
  F:    Documentation/timers/
  F:    kernel/hrtimer.c
@@@ -3133,7 -3049,6 +3133,7 @@@ S:      Maintaine
  F:    include/linux/hippidevice.h
  F:    include/linux/if_hippi.h
  F:    net/802/hippi.c
 +F:    drivers/net/hippi/
  
  HOST AP DRIVER
  M:    Jouni Malinen <[email protected]>
@@@ -3151,7 -3066,7 +3151,7 @@@ F:      drivers/platform/x86/tc1100-wmi.
  HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
  M:    Jaroslav Kysela <[email protected]>
  S:    Maintained
 -F:    drivers/net/hp100.*
 +F:    drivers/net/ethernet/hp/hp100.*
  
  HPET: High Precision Event Timers driver
  M:    Clemens Ladisch <[email protected]>
@@@ -3229,7 -3144,8 +3229,7 @@@ IA64 (Itanium) PLATFOR
  M:    Tony Luck <[email protected]>
  M:    Fenghua Yu <[email protected]>
  L:    [email protected]
 -W:    http://www.ia64-linux.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  S:    Maintained
  F:    arch/ia64/
  
@@@ -3248,7 -3164,7 +3248,7 @@@ IBM Power Virtual Ethernet Device Drive
  M:    Santiago Leon <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/ibmveth.*
 +F:    drivers/net/ethernet/ibm/ibmveth.*
  
  IBM ServeRAID RAID DRIVER
  P:    Jack Hammer
@@@ -3267,13 -3183,6 +3267,13 @@@ F:    Documentation/ide
  F:    drivers/ide/
  F:    include/linux/ide.h
  
 +IDEAPAD LAPTOP EXTRAS DRIVER
 +M:    Ike Panhc <[email protected]>
 +L:    [email protected]
 +W:    http://launchpad.net/ideapad-laptop
 +S:    Maintained
 +F:    drivers/platform/x86/ideapad-laptop.c
 +
  IDE/ATAPI DRIVERS
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
@@@ -3283,7 -3192,7 +3283,7 @@@ F:      drivers/ide/ide-cd
  
  IDLE-I7300
  M:    Andy Henroid <[email protected]>
 -L:    linux-pm@lists.linux-foundation.org
 +L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    drivers/idle/i7300_idle.c
  
@@@ -3353,20 -3262,9 +3353,20 @@@ F:    Documentation/input/multi-touch-prot
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
  
 +INTEL C600 SERIES SAS CONTROLLER DRIVER
 +M:    Intel SCU Linux support <[email protected]>
 +M:    Dan Williams <[email protected]>
 +M:    Dave Jiang <[email protected]>
 +M:    Ed Nadolski <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git
 +S:    Maintained
 +F:    drivers/scsi/isci/
 +F:    firmware/isci/
 +
  INTEL IDLE DRIVER
  M:    Len Brown <[email protected]>
 -L:    linux-pm@lists.linux-foundation.org
 +L:    linux-pm@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
  S:    Supported
  F:    drivers/idle/intel_idle.c
@@@ -3407,7 -3305,7 +3407,7 @@@ M:      David Woodhouse <[email protected]
  L:    [email protected]
  T:    git git://git.infradead.org/iommu-2.6.git
  S:    Supported
 -F:    drivers/pci/intel-iommu.c
 +F:    drivers/iommu/intel-iommu.c
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
@@@ -3422,7 -3320,7 +3422,7 @@@ F:      arch/arm/mach-ixp4xx/include/mach/qm
  F:    arch/arm/mach-ixp4xx/include/mach/npe.h
  F:    arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
  F:    arch/arm/mach-ixp4xx/ixp4xx_npe.c
 -F:    drivers/net/arm/ixp4xx_eth.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
  F:    drivers/net/wan/ixp4xx_hss.c
  
  INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
@@@ -3434,7 -3332,7 +3434,7 @@@ INTEL IXP2000 ETHERNET DRIVE
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ixp2000/
 +F:    drivers/net/ethernet/xscale/ixp2000/
  
  INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
  M:    Jeff Kirsher <[email protected]>
@@@ -3443,13 -3341,13 +3443,13 @@@ M:   Bruce Allan <[email protected]
  M:    Carolyn Wyborny <[email protected]>
  M:    Don Skidmore <[email protected]>
  M:    Greg Rose <[email protected]>
 -M:    PJ Waskiewicz <[email protected]>
 +M:    Peter P Waskiewicz Jr <[email protected]>
  M:    Alex Duyck <[email protected]>
  M:    John Ronciak <[email protected]>
  L:    [email protected]
  W:    http://e1000.sourceforge.net/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next.git
  S:    Supported
  F:    Documentation/networking/e100.txt
  F:    Documentation/networking/e1000.txt
@@@ -3459,11 -3357,18 +3459,11 @@@ F:   Documentation/networking/igbvf.tx
  F:    Documentation/networking/ixgb.txt
  F:    Documentation/networking/ixgbe.txt
  F:    Documentation/networking/ixgbevf.txt
 -F:    drivers/net/e100.c
 -F:    drivers/net/e1000/
 -F:    drivers/net/e1000e/
 -F:    drivers/net/igb/
 -F:    drivers/net/igbvf/
 -F:    drivers/net/ixgb/
 -F:    drivers/net/ixgbe/
 -F:    drivers/net/ixgbevf/
 +F:    drivers/net/ethernet/intel/
  
  INTEL MRST PMU DRIVER
  M:    Len Brown <[email protected]>
 -L:    linux-pm@lists.linux-foundation.org
 +L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    arch/x86/platform/mrst/pmu.*
  
@@@ -3511,7 -3416,7 +3511,7 @@@ M:      Wey-Yi Guy <[email protected]
  M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
  W:    http://intellinuxwireless.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
  S:    Supported
  F:    drivers/net/wireless/iwlwifi/
  
@@@ -3527,7 -3432,7 +3527,7 @@@ IOC3 ETHERNET DRIVE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ioc3-eth.c
 +F:    drivers/net/ethernet/sgi/ioc3-eth.c
  
  IOC3 SERIAL DRIVER
  M:    Pat Gefre <[email protected]>
@@@ -3545,7 -3450,7 +3545,7 @@@ M:      Francois Romieu <[email protected]
  M:    Sorbica Shieh <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ipg.*
 +F:    drivers/net/ethernet/icplus/ipg.*
  
  IPATH DRIVER
  M:    Mike Marciniszyn <[email protected]>
@@@ -3611,7 -3516,7 +3611,7 @@@ F:      net/irda
  IRQ SUBSYSTEM
  M:    Thomas Gleixner <[email protected]>
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
  
  ISAPNP
@@@ -3693,7 -3598,7 +3693,7 @@@ JME NETWORK DRIVE
  M:    Guo-Fu Tseng <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/jme.*
 +F:    drivers/net/ethernet/jme.*
  
  JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
  M:    David Woodhouse <[email protected]>
@@@ -3720,7 -3625,7 +3720,7 @@@ F:      fs/jbd2
  F:    include/linux/jbd2.h
  
  JSM Neo PCI based serial card
 -M:    Breno Leitao <leitao@linux.vnet.ibm.com>
 +M:    Lucas Tavares <lucaskt@linux.vnet.ibm.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial/jsm/
@@@ -4060,7 -3965,6 +4060,7 @@@ M:      Eric Piel <[email protected]
  S:    Maintained
  F:    Documentation/misc-devices/lis3lv02d
  F:    drivers/misc/lis3lv02d/
 +F:    drivers/platform/x86/hp_accel.c
  
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <[email protected]>
@@@ -4099,7 -4003,7 +4099,7 @@@ F:      drivers/hwmon/lm90.
  LOCKDEP AND LOCKSTAT
  M:    Peter Zijlstra <[email protected]>
  M:    Ingo Molnar <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
  S:    Maintained
  F:    Documentation/lockdep*.txt
  F:    Documentation/lockstat.txt
@@@ -4155,7 -4059,7 +4155,7 @@@ S:      Maintaine
  
  M32R ARCHITECTURE
  M:    Hirokazu Takata <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (in Japanese)
  W:    http://www.linux-m32r.org/
  S:    Maintained
@@@ -4225,7 -4129,7 +4225,7 @@@ MARVELL MV643XX ETHERNET DRIVE
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/mv643xx_eth.*
 +F:    drivers/net/ethernet/marvell/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
  MARVELL MWIFIEX WIRELESS DRIVER
@@@ -4281,9 -4185,7 +4281,9 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/dvb/
  F:    Documentation/video4linux/
 +F:    Documentation/DocBook/media/
  F:    drivers/media/
 +F:    drivers/staging/media/
  F:    include/media/
  F:    include/linux/dvb/
  F:    include/linux/videodev*.h
@@@ -4305,11 -4207,9 +4305,11 @@@ F:    include/linux/mm.
  F:    mm/
  
  MEMORY RESOURCE CONTROLLER
 +M:    Johannes Weiner <[email protected]>
 +M:    Michal Hocko <[email protected]>
  M:    Balbir Singh <[email protected]>
 -M:    Daisuke Nishimura <[email protected]>
  M:    KAMEZAWA Hiroyuki <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    mm/memcontrol.c
@@@ -4328,7 -4228,7 +4328,7 @@@ F:      include/mtd
  
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://www.monstr.eu/fdt/
  T:    git git://git.monstr.eu/linux-2.6-microblaze.git
  S:    Supported
@@@ -4343,7 -4243,7 +4343,7 @@@ MIP
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mips.org/
 -T:    git git://git.linux-mips.org/pub/scm/linux.git
 +T:    git git://git.linux-mips.org/pub/scm/ralf/linux.git
  Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
  S:    Supported
  F:    Documentation/mips/
@@@ -4443,12 -4343,12 +4443,12 @@@ M:   Andrew Gallatin <[email protected]
  L:    [email protected]
  W:    http://www.myri.com/scs/download-Myri10GE.html
  S:    Supported
 -F:    drivers/net/myri10ge/
 +F:    drivers/net/ethernet/myricom/myri10ge/
  
  NATSEMI ETHERNET DRIVER (DP8381x)
  M:    Tim Hockin <[email protected]>
  S:    Maintained
 -F:    drivers/net/natsemi.c
 +F:    drivers/net/ethernet/natsemi/natsemi.c
  
  NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
  M:    Daniel Mack <[email protected]>
@@@ -4476,7 -4376,7 +4476,7 @@@ S:      Supporte
  F:    drivers/infiniband/hw/nes/
  
  NETEM NETWORK EMULATOR
 -M:    Stephen Hemminger <shemminger@linux-foundation.org>
 +M:    Stephen Hemminger <shemminger@vyatta.com>
  L:    [email protected]
  S:    Maintained
  F:    net/sched/sch_netem.c
@@@ -4488,21 -4388,23 +4488,21 @@@ W:   http://trac.neterion.com/cgi-bin/tra
  W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
  S:    Supported
  F:    Documentation/networking/s2io.txt
 -F:    drivers/net/s2io*
  F:    Documentation/networking/vxge.txt
 -F:    drivers/net/vxge/
 +F:    drivers/net/ethernet/neterion/
  
  NETFILTER/IPTABLES/IPCHAINS
 -P:    Rusty Russell
 -P:    Marc Boucher
 -P:    James Morris
  P:    Harald Welte
  P:    Jozsef Kadlecsik
 +M:    Pablo Neira Ayuso <[email protected]>
  M:    Patrick McHardy <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
  S:    Supported
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
@@@ -4601,23 -4503,11 +4601,23 @@@ F:   include/linux/if_
  F:    include/linux/*device.h
  
  NETXEN (1/10) GbE SUPPORT
 -M:    Amit Kumar Salecha <[email protected]>
 +M:    Sony Chacko <[email protected]>
 +M:    Rajesh Borundia <[email protected]>
  L:    [email protected]
  W:    http://www.qlogic.com
  S:    Supported
 -F:    drivers/net/netxen/
 +F:    drivers/net/ethernet/qlogic/netxen/
 +
 +NFC SUBSYSTEM
 +M:    Lauro Ramos Venancio <[email protected]>
 +M:    Aloisio Almeida Jr <[email protected]>
 +M:    Samuel Ortiz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    net/nfc/
 +F:    include/linux/nfc.h
 +F:    include/net/nfc/
 +F:    drivers/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <[email protected]>
@@@ -4638,7 -4528,7 +4638,7 @@@ M:      Jan-Pascal van Best <janpascal@vanbe
  M:    Andreas Mohr <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ni5010.*
 +F:    drivers/net/ethernet/racal/ni5010.*
  
  NILFS2 FILESYSTEM
  M:    KONISHI Ryusuke <[email protected]>
@@@ -4687,7 -4577,7 +4687,7 @@@ L:      [email protected]
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
  S:    Maintained
  F:    arch/arm/*omap*/
  
@@@ -4735,13 -4625,6 +4735,13 @@@ S:    Maintaine
  F:    drivers/video/omap2/
  F:    Documentation/arm/OMAP/DSS
  
 +OMAP HARDWARE SPINLOCK SUPPORT
 +M:    Ohad Ben-Cohen <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwspinlock/omap_hwspinlock.c
 +F:    arch/arm/mach-omap2/hwspinlock.c
 +
  OMAP MMC SUPPORT
  M:    Jarkko Lavinen <[email protected]>
  L:    [email protected]
@@@ -4836,12 -4719,10 +4836,12 @@@ F:   drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <[email protected]>
 +M:    Rob Herring <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 +F:    Documentation/devicetree
  F:    drivers/of
  F:    include/linux/of*.h
  K:    of_get_property
@@@ -4850,7 -4731,7 +4850,7 @@@ K:      of_match_tabl
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
  W:    http://openrisc.net
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://openrisc.net/~jonas/linux
  F:    arch/openrisc
@@@ -4893,7 -4774,7 +4893,7 @@@ F:      drivers/net/wireless/orinoco
  
  OSD LIBRARY and FILESYSTEM
  M:    Boaz Harrosh <[email protected]>
 -M:    Benny Halevy <bhalevy@panasas.com>
 +M:    Benny Halevy <bhalevy@tonian.com>
  L:    [email protected]
  W:    http://open-osd.org
  T:    git git://git.open-osd.org/open-osd.git
@@@ -4913,7 -4794,7 +4913,7 @@@ PA SEMI ETHERNET DRIVE
  M:    Olof Johansson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/pasemi_mac.*
 +F:    drivers/net/ethernet/pasemi/*
  
  PA SEMI SMBUS DRIVER
  M:    Olof Johansson <[email protected]>
@@@ -4953,7 -4834,7 +4953,7 @@@ F:      drivers/char/ppdev.
  F:    include/linux/ppdev.h
  
  PARAVIRT_OPS INTERFACE
 -M:    Jeremy Fitzhardinge <jeremy@xensource.com>
 +M:    Jeremy Fitzhardinge <jeremy@goop.org>
  M:    Chris Wright <[email protected]>
  M:    Alok Kataria <[email protected]>
  M:    Rusty Russell <[email protected]>
@@@ -5024,7 -4905,7 +5024,7 @@@ F:      include/linux/i2c-algo-pca.
  F:    include/linux/i2c-pca-platform.h
  
  PCI ERROR RECOVERY
 -M:    Linas Vepstas <[email protected].com>
 +M:     Linas Vepstas <linasvepstas@gmail.com>
  L:    [email protected]
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
@@@ -5060,7 -4941,7 +5060,7 @@@ PCNET32 NETWORK DRIVE
  M:    Don Fry <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/pcnet32.c
 +F:    drivers/net/ethernet/amd/pcnet32.c
  
  PCRYPT PARALLEL CRYPTO ENGINE
  M:    Steffen Klassert <[email protected]>
@@@ -5089,7 -4970,6 +5089,7 @@@ M:      Peter Zijlstra <a.p.zijlstra@chello.
  M:    Paul Mackerras <[email protected]>
  M:    Ingo Molnar <[email protected]>
  M:    Arnaldo Carvalho de Melo <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Supported
  F:    kernel/events/*
  F:    include/linux/perf_event.h
@@@ -5121,11 -5001,6 +5121,11 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/devices/phram.c
  
 +PIN CONTROL SUBSYSTEM
 +M:    Linus Walleij <[email protected]>
 +S:    Maintained
 +F:    drivers/pinmux/
 +
  PKTCDVD DRIVER
  M:    Peter Osterlund <[email protected]>
  S:    Maintained
@@@ -5169,7 -5044,6 +5169,7 @@@ F:      drivers/scsi/pm8001
  
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    fs/timerfd.c
  F:    include/linux/timer*
@@@ -5199,7 -5073,7 +5199,7 @@@ PPP PROTOCOL DRIVERS AND COMPRESSOR
  M:    Paul Mackerras <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ppp_*
 +F:    drivers/net/ppp/ppp_*
  
  PPP OVER ATM (RFC 2364)
  M:    Mitchell Blank Jr <[email protected]>
@@@ -5210,8 -5084,8 +5210,8 @@@ F:      include/linux/atmppp.
  PPP OVER ETHERNET
  M:    Michal Ostrowski <[email protected]>
  S:    Maintained
 -F:    drivers/net/pppoe.c
 -F:    drivers/net/pppox.c
 +F:    drivers/net/ppp/pppoe.c
 +F:    drivers/net/ppp/pppox.c
  
  PPP OVER L2TP
  M:    James Chapman <[email protected]>
@@@ -5232,7 -5106,7 +5232,7 @@@ PPTP DRIVE
  M:    Dmitry Kozlov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/pptp.c
 +F:    drivers/net/ppp/pptp.c
  W:    http://sourceforge.net/projects/accel-pptp
  
  PREEMPTIBLE KERNEL
@@@ -5261,7 -5135,7 +5261,7 @@@ M:      Geoff Levand <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/ps3_gelic_net.*
 +F:    drivers/net/ethernet/toshiba/ps3_gelic_net.*
  
  PS3 PLATFORM SUPPORT
  M:    Geoff Levand <[email protected]>
@@@ -5379,24 -5253,23 +5379,24 @@@ M:   [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/LICENSE.qla3xxx
 -F:    drivers/net/qla3xxx.*
 +F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    Amit Kumar Salecha <[email protected]>
  M:    Anirban Chakraborty <[email protected]>
 +M:    Sony Chacko <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/qlcnic/
 +F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Anirban Chakraborty <[email protected]>
  M:    Jitendra Kalsaria <[email protected]>
  M:    Ron Mercer <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/qlge/
 +F:    drivers/net/ethernet/qlogic/qlge/
  
  QNX4 FILESYSTEM
  M:    Anders Larsen <[email protected]>
@@@ -5406,12 -5279,6 +5406,12 @@@ F:    fs/qnx4
  F:    include/linux/qnx4_fs.h
  F:    include/linux/qnxtypes.h
  
 +QUALCOMM HEXAGON ARCHITECTURE
 +M:    Richard Kuo <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/hexagon/
 +
  RADOS BLOCK DEVICE (RBD)
  F:    include/linux/qnxtypes.h
  M:    Yehuda Sadeh <[email protected]>
@@@ -5484,10 -5351,10 +5484,10 @@@ RDC R6040 FAST ETHERNET DRIVE
  M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/r6040.c
 +F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Andy Grover <andy.grover@oracle.com>
 +M:    Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    net/rds/
@@@ -5664,6 -5531,7 +5664,6 @@@ F:      drivers/media/video/*7146
  F:    include/media/*7146*
  
  SAMSUNG AUDIO (ASoC) DRIVERS
 -M:    Jassi Brar <[email protected]>
  M:    Sangbeom Kim <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
@@@ -5685,7 -5553,6 +5685,7 @@@ F:      drivers/dma/dw_dmac.
  TIMEKEEPING, NTP
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
  F:    include/linux/clocksource.h
  F:    include/linux/time.h
@@@ -5710,7 -5577,6 +5710,7 @@@ F:      drivers/watchdog/sc1200wdt.
  SCHEDULER
  M:    Ingo Molnar <[email protected]>
  M:    Peter Zijlstra <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
  S:    Maintained
  F:    kernel/sched*
  F:    include/linux/sched.h
@@@ -5889,7 -5755,7 +5889,7 @@@ M:      Ajit Khaparde <ajit.khaparde@emulex.
  L:    [email protected]
  W:    http://www.emulex.com
  S:    Supported
 -F:    drivers/net/benet/
 +F:    drivers/net/ethernet/emulex/benet/
  
  SFC NETWORK DRIVER
  M:    Solarflare linux maintainers <[email protected]>
@@@ -5897,7 -5763,7 +5897,7 @@@ M:      Steve Hodgson <[email protected]
  M:    Ben Hutchings <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/sfc/
 +F:    drivers/net/ethernet/sfc/
  
  SGI GRU DRIVER
  M:    Jack Steiner <[email protected]>
@@@ -5963,14 -5829,14 +5963,14 @@@ SIS 190 ETHERNET DRIVE
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/sis190.c
 +F:    drivers/net/ethernet/sis/sis190.c
  
  SIS 900/7016 FAST ETHERNET DRIVER
  M:    Daniele Venzano <[email protected]>
  W:    http://www.brownhat.org/sis900.html
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/sis900.*
 +F:    drivers/net/ethernet/sis/sis900.*
  
  SIS 96X I2C/SMBUS DRIVER
  M:    "Mark M. Hoffman" <[email protected]>
@@@ -5994,10 -5860,11 +5994,10 @@@ S:   Maintaine
  F:    drivers/usb/misc/sisusbvga/
  
  SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
 -M:    Stephen Hemminger <shemminger@linux-foundation.org>
 +M:    Stephen Hemminger <shemminger@vyatta.com>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/skge.*
 -F:    drivers/net/sky2.*
 +F:    drivers/net/ethernet/marvell/sk*
  
  SLAB ALLOCATOR
  M:    Christoph Lameter <[email protected]>
@@@ -6011,7 -5878,7 +6011,7 @@@ F:      mm/sl?b.
  SMC91x ETHERNET DRIVER
  M:    Nicolas Pitre <[email protected]>
  S:    Odd Fixes
 -F:    drivers/net/smc91x.*
 +F:    drivers/net/ethernet/smsc/smc91x.*
  
  SMM665 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
@@@ -6046,19 -5913,13 +6046,19 @@@ M:   Steve Glendinning <steve.glendinning
  L:    [email protected]
  S:    Supported
  F:    include/linux/smsc911x.h
 -F:    drivers/net/smsc911x.*
 +F:    drivers/net/ethernet/smsc/smsc911x.*
  
  SMSC9420 PCI ETHERNET DRIVER
  M:    Steve Glendinning <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/smsc9420.*
 +F:    drivers/net/ethernet/smsc/smsc9420.*
 +
 +SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 +M:    Steve Glendinning <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/video/smscufx.c
  
  SN-IA64 (Itanium) SUB-PLATFORM
  M:    Jes Sorensen <[email protected]>
@@@ -6092,7 -5953,7 +6092,7 @@@ SONIC NETWORK DRIVE
  M:    Thomas Bogendoerfer <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/sonic.*
 +F:    drivers/net/ethernet/natsemi/sonic.*
  
  SONICS SILICON BACKPLANE DRIVER (SSB)
  M:    Michael Buesch <[email protected]>
@@@ -6129,7 -5990,7 +6129,7 @@@ M:      Jaroslav Kysela <[email protected]
  M:    Takashi Iwai <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.alsa-project.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
  T:    git git://git.alsa-project.org/alsa-kernel.git
  S:    Maintained
  F:    Documentation/sound/
@@@ -6139,7 -6000,7 +6139,7 @@@ F:      sound
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
  L:    [email protected] (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
@@@ -6233,7 -6094,7 +6233,7 @@@ M:      Jens Osterkamp <[email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/spider_net.txt
 -F:    drivers/net/spider_net*
 +F:    drivers/net/ethernet/toshiba/spider_net*
  
  SPU FILE SYSTEM
  M:    Jeremy Kerr <[email protected]>
@@@ -6264,7 -6125,7 +6264,7 @@@ S:      Maintaine
  
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/
@@@ -6280,6 -6141,12 +6280,6 @@@ M:     Jakub Schmidtke <[email protected]
  S:    Odd Fixes
  F:    drivers/staging/asus_oled/
  
 -STAGING - ATHEROS ATH6KL WIRELESS DRIVER
 -M:    Luis R. Rodriguez <[email protected]>
 -M:    Naveen Singh <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/ath6kl/
 -
  STAGING - COMEDI
  M:    Ian Abbott <[email protected]>
  M:    Mori Hess <[email protected]>
@@@ -6305,11 -6172,6 +6305,11 @@@ M:    David Rowe <[email protected]
  S:    Odd Fixes
  F:    drivers/staging/echo/
  
 +STAGING - ET131X NETWORK DRIVER
 +M:    Mark Einon <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/staging/et131x/
 +
  STAGING - FLARION FT1000 DRIVERS
  M:    Marek Belisko <[email protected]>
  S:    Odd Fixes
@@@ -6338,13 -6200,6 +6338,13 @@@ W:    http://www.lirc.org
  S:    Odd Fixes
  F:    drivers/staging/lirc/
  
 +STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
 +M:    Julian Andres Klode <[email protected]>
 +M:    Marc Dietrich <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/staging/nvec/
 +
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
  M:    Andres Salomon <[email protected]>
  M:    Chris Ball <[email protected]>
@@@ -6417,7 -6272,7 +6417,7 @@@ F:      drivers/staging/xgifb
  STARFIRE/DURALAN NETWORK DRIVER
  M:    Ion Badulescu <[email protected]>
  S:    Odd Fixes
 -F:    drivers/net/starfire*
 +F:    drivers/net/ethernet/adaptec/starfire*
  
  SUN3/3X
  M:    Sam Creasey <[email protected]>
@@@ -6426,7 -6281,6 +6426,7 @@@ S:      Maintaine
  F:    arch/m68k/kernel/*sun3*
  F:    arch/m68k/sun3*/
  F:    arch/m68k/include/asm/sun3*
 +F:    drivers/net/ethernet/i825xx/sun3*
  
  SUPERH
  M:    Paul Mundt <[email protected]>
@@@ -6443,7 -6297,7 +6443,7 @@@ SUSPEND TO RA
  M:    Len Brown <[email protected]>
  M:    Pavel Machek <[email protected]>
  M:    "Rafael J. Wysocki" <[email protected]>
 -L:    linux-pm@lists.linux-foundation.org
 +L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    Documentation/power/
  F:    arch/x86/kernel/acpi/
@@@ -6503,18 -6357,19 +6503,18 @@@ F:   net/ipv4/tcp_lp.
  
  TEGRA SUPPORT
  M:    Colin Cross <[email protected]>
 -M:    Erik Gilling <[email protected]>
  M:    Olof Johansson <[email protected]>
 +M:    Stephen Warren <[email protected]>
  L:    [email protected]
 -T:    git git://android.git.kernel.org/kernel/tegra.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra
  
  TEHUTI ETHERNET DRIVER
 -M:    Alexander Indenbaum <[email protected]>
  M:    Andy Gospodarek <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/tehuti*
 +F:    drivers/net/ethernet/tehuti/*
  
  Telecom Clock Driver for MCPL0010
  M:    Mark Gross <[email protected]>
@@@ -6565,7 -6420,7 +6565,7 @@@ W:      http://www.tilera.com/scm
  S:    Supported
  F:    arch/tile/
  F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/net/tile/
 +F:    drivers/net/ethernet/tile/
  F:    drivers/edac/tile_edac.c
  
  TLAN NETWORK DRIVER
@@@ -6574,7 -6429,7 +6574,7 @@@ L:      [email protected] (su
  W:    http://sourceforge.net/projects/tlan/
  S:    Maintained
  F:    Documentation/networking/tlan.txt
 -F:    drivers/net/tlan.*
 +F:    drivers/net/ethernet/ti/tlan.*
  
  TOMOYO SECURITY MODULE
  M:    Kentaro Takeda <[email protected]>
@@@ -6584,7 -6439,7 +6584,7 @@@ L:      [email protected]
  L:    [email protected] (subscribers-only, for developers in Japanese)
  L:    [email protected] (subscribers-only, for users in Japanese)
  W:    http://tomoyo.sourceforge.jp/
 -T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.4.x/tomoyo-lsm/patches/
 +T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
  S:    Maintained
  F:    security/tomoyo/
  
@@@ -6638,7 -6493,7 +6638,7 @@@ TRACIN
  M:    Steven Rostedt <[email protected]>
  M:    Frederic Weisbecker <[email protected]>
  M:    Ingo Molnar <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
  S:    Maintained
  F:    Documentation/trace/ftrace.txt
  F:    arch/*/*/*/ftrace.h
@@@ -6668,7 -6523,7 +6668,7 @@@ TULIP NETWORK DRIVER
  M:    Grant Grundler <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/tulip/
 +F:    drivers/net/ethernet/tulip/
  
  TUN/TAP driver
  M:    Maxim Krasnyansky <[email protected]>
@@@ -6714,10 -6569,11 +6714,10 @@@ W:   http://uclinux-h8.sourceforge.jp
  S:    Supported
  F:    arch/h8300/
  F:    drivers/ide/ide-h8300.c
 -F:    drivers/net/ne-h8300.c
 +F:    drivers/net/ethernet/8390/ne-h8300.c
  
  UDF FILESYSTEM
  M:    Jan Kara <[email protected]>
 -W:    http://linux-udf.sourceforge.net
  S:    Maintained
  F:    Documentation/filesystems/udf.txt
  F:    fs/udf/
@@@ -7141,7 -6997,7 +7141,7 @@@ F:      include/linux/vhost.
  VIA RHINE NETWORK DRIVER
  M:    Roger Luethi <[email protected]>
  S:    Maintained
 -F:    drivers/net/via-rhine.c
 +F:    drivers/net/ethernet/via/via-rhine.c
  
  VIAPRO SMBUS DRIVER
  M:    Jean Delvare <[email protected]>
@@@ -7169,7 -7025,7 +7169,7 @@@ VIA VELOCITY NETWORK DRIVE
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/via-velocity.*
 +F:    drivers/net/ethernet/via/via-velocity.*
  
  VLAN (802.1Q)
  M:    Patrick McHardy <[email protected]>
@@@ -7278,12 -7134,6 +7278,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/wd7000.c
  
 +WIIMOTE HID DRIVER
 +M:    David Herrmann <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-wiimote*
 +
  WINBOND CIR DRIVER
  M:    David Härdeman <[email protected]>
  S:    Maintained
@@@ -7349,11 -7199,7 +7349,11 @@@ T:    git git://opensource.wolfsonmicro.co
  W:    http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
  S:    Supported
  F:    Documentation/hwmon/wm83??
 +F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/leds/leds-wm83*.c
 +F:    drivers/input/misc/wm831x-on.c
 +F:    drivers/input/touchscreen/wm831x-ts.c
 +F:    drivers/input/touchscreen/wm97*.c
  F:    drivers/mfd/wm8*.c
  F:    drivers/power/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
@@@ -7363,7 -7209,6 +7363,7 @@@ F:      drivers/watchdog/wm83*_wdt.
  F:    include/linux/mfd/wm831x/
  F:    include/linux/mfd/wm8350/
  F:    include/linux/mfd/wm8400*
 +F:    include/linux/wm97xx.h
  F:    include/sound/wm????.h
  F:    sound/soc/codecs/wm*
  
@@@ -7388,7 -7233,7 +7388,7 @@@ M:      Thomas Gleixner <[email protected]
  M:    Ingo Molnar <[email protected]>
  M:    "H. Peter Anvin" <[email protected]>
  M:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
  S:    Maintained
  F:    Documentation/x86/
  F:    arch/x86/
@@@ -7408,8 -7253,8 +7408,8 @@@ S:      Maintaine
  F:    arch/x86/kernel/cpu/mcheck/*
  
  XEN HYPERVISOR INTERFACE
 -M:    Jeremy Fitzhardinge <[email protected]>
  M:    Konrad Rzeszutek Wilk <[email protected]>
 +M:    Jeremy Fitzhardinge <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
@@@ -7442,8 -7287,7 +7442,8 @@@ F:      drivers/xen/*swiotlb
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Alex Elder <[email protected]>
 +M:    Ben Myers <[email protected]>
 +M:    Alex Elder <[email protected]>
  M:    [email protected]
  L:    [email protected]
  W:    http://oss.sgi.com/projects/xfs