Merge branches 'gemini' and 'misc' into devel

1 files changed, 312 insertions, 127 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f3225b58369b..9eb77130b7cd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -131,19 +131,12 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/typhoon*
 
-3W-9XXX SATA-RAID CONTROLLER DRIVER
-M:      Adam Radford <linuxraid@amcc.com>
+3WARE SAS/SATA-RAID SCSI DRIVERS (3W-XXXX, 3W-9XXX, 3W-SAS)
+M:      Adam Radford <linuxraid@lsi.com>
 L:      linux-scsi@vger.kernel.org
-W:      http://www.amcc.com
+W:      http://www.lsi.com
 S:      Supported
-F:      drivers/scsi/3w-9xxx*
-
-3W-XXXX ATA-RAID CONTROLLER DRIVER
-M:      Adam Radford <linuxraid@amcc.com>
-L:      linux-scsi@vger.kernel.org
-W:      http://www.amcc.com
-S:      Supported
-F:      drivers/scsi/3w-xxxx*
+F:      drivers/scsi/3w-*
 
 53C700 AND 53C700-66 SCSI DRIVER
 M:      "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
@@ -320,11 +313,9 @@ S:	Maintained
 F:      drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
-M:      Michael Wu <flamingice@sourmilk.net>
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/adm8211.*
 
 ADT746X FAN DRIVER
@@ -485,8 +476,8 @@ S:	Maintained
 F:      drivers/input/mouse/bcm5974.c
 
 APPLE SMC DRIVER
-M:      Nicolas Boichat <nicolas@boichat.ch>
-L:      mactel-linux-devel@lists.sourceforge.net
+M:      Henrik Rydberg <rydberg@euromail.se>
+L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      drivers/hwmon/applesmc.c
 
@@ -586,6 +577,12 @@ F:	drivers/mtd/nand/bcm_umi_bch.c
 F:      drivers/mtd/nand/bcm_umi_hamming.c
 F:      drivers/mtd/nand/nand_bcm_umi.h
 
+ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
+M:      Anton Vorontsov <avorontsov@mvista.com>
+S:      Maintained
+F:      arch/arm/mach-cns3xxx/
+T:      git git://git.infradead.org/users/cbou/linux-cns3xxx.git
+
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 M:      Hartley Sweeten <hsweeten@visionengravers.com>
 M:      Ryan Mallon <ryan@bluewatersys.com>
@@ -776,11 +773,10 @@ M:	Philipp Zabel <philipp.zabel@gmail.com>
 S:      Maintained
 
 ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
-M:      Lennert Buytenhek <buytenh@marvell.com>
-M:      Nicolas Pitre <nico@marvell.com>
+M:      Lennert Buytenhek <kernel@wantstofly.org>
+M:      Nicolas Pitre <nico@fluxnic.net>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:      git git://git.marvell.com/orion
-S:      Maintained
+S:      Odd Fixes
 F:      arch/arm/mach-loki/
 F:      arch/arm/mach-kirkwood/
 F:      arch/arm/mach-mv78xx0/
@@ -798,12 +794,12 @@ M:	Michael Petchkovsky <mkpetch@internode.on.net>
 S:      Maintained
 
 ARM/NOMADIK ARCHITECTURE
-M:     Alessandro Rubini <rubini@unipv.it>
-M:     STEricsson <STEricsson_nomadik_linux@list.st.com>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-F:     arch/arm/mach-nomadik/
-F:     arch/arm/plat-nomadik/
+M:      Alessandro Rubini <rubini@unipv.it>
+M:      STEricsson <STEricsson_nomadik_linux@list.st.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-nomadik/
+F:      arch/arm/plat-nomadik/
 
 ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
 M:      Nelson Castillo <arhuaco@freaks-unidos.net>
@@ -815,6 +811,7 @@ ARM/QUALCOMM MSM MACHINE SUPPORT
 M:      David Brown <davidb@codeaurora.org>
 M:      Daniel Walker <dwalker@codeaurora.org>
 M:      Bryan Huntsman <bryanh@codeaurora.org>
+L:      linux-arm-msm@vger.kernel.org
 F:      arch/arm/mach-msm/
 F:      drivers/video/msm/
 F:      drivers/mmc/host/msm_sdcc.c
@@ -898,11 +895,13 @@ S:	Maintained
 
 ARM/SAMSUNG ARM ARCHITECTURES
 M:      Ben Dooks <ben-linux@fluff.org>
+M:      Kukjin Kim <kgene.kim@samsung.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.fluff.org/ben/linux/
 S:      Maintained
-F:      arch/arm/plat-s3c/
+F:      arch/arm/plat-samsung/
 F:      arch/arm/plat-s3c24xx/
+F:      arch/arm/plat-s5p/
 
 ARM/S3C2410 ARM ARCHITECTURE
 M:      Ben Dooks <ben-linux@fluff.org>
@@ -971,6 +970,28 @@ M:	Wan ZongShun <mcuos.com@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.mcuos.com
 S:      Maintained
+F:      arch/arm/mach-w90x900/
+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/mtd/nand/w90p910_nand.c
+F:      drivers/rtc/rtc-nuc900.c
+F:      drivers/spi/spi_nuc900.c
+F:      drivers/usb/host/ehci-w90x900.c
+F:      drivers/video/nuc900fb.c
+F:      drivers/sound/soc/nuc900/
+
+ARM/U300 MACHINE SUPPORT
+M:      Linus Walleij <linus.walleij@stericsson.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Supported
+F:      arch/arm/mach-u300/
+F:      drivers/i2c/busses/i2c-stu300.c
+F:      drivers/rtc/rtc-coh901331.c
+F:      drivers/watchdog/coh901327_wdt.c
+F:      drivers/dma/coh901318*
 
 ARM/U8500 ARM ARCHITECTURE
 M:      Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
@@ -985,6 +1006,20 @@ W:	http://www.arm.linux.org.uk/
 S:      Maintained
 F:      arch/arm/vfp/
 
+ARM/VOIPAC 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/vpac270.c
+F:      arch/arm/mach-pxa/include/mach-pxa/vpac270.h
+
+ARM/ZIPIT Z2 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/z2.c
+F:      arch/arm/mach-pxa/include/mach-pxa/z2.h
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:      George Joseph <george.joseph@fairview5.com>
 L:      lm-sensors@lm-sensors.org
@@ -1114,7 +1149,7 @@ F:	drivers/mmc/host/atmel-mci.c
 F:      drivers/mmc/host/atmel-mci-regs.h
 
 ATMEL AT91 / AT32 SERIAL DRIVER
-M:      Haavard Skinnemoen <hskinnemoen@atmel.com>
+M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 S:      Supported
 F:      drivers/serial/atmel_serial.c
 
@@ -1126,18 +1161,18 @@ F:	drivers/video/atmel_lcdfb.c
 F:      include/video/atmel_lcdc.h
 
 ATMEL MACB ETHERNET DRIVER
-M:      Haavard Skinnemoen <hskinnemoen@atmel.com>
+M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 S:      Supported
 F:      drivers/net/macb.*
 
 ATMEL SPI DRIVER
-M:      Haavard Skinnemoen <hskinnemoen@atmel.com>
+M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 S:      Supported
 F:      drivers/spi/atmel_spi.*
 
 ATMEL USBA UDC DRIVER
-M:      Haavard Skinnemoen <hskinnemoen@atmel.com>
-L:      kernel@avr32linux.org
+M:      Nicolas Ferre <nicolas.ferre@atmel.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
 S:      Supported
 F:      drivers/usb/gadget/atmel_usba_udc.*
@@ -1333,7 +1368,7 @@ BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 M:      Eilon Greenstein <eilong@broadcom.com>
 L:      netdev@vger.kernel.org
 S:      Supported
-F:      drivers/net/bnx2x*
+F:      drivers/net/bnx2x/
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
 M:      Matt Carlson <mcarlson@broadcom.com>
@@ -1442,6 +1477,15 @@ F:	arch/powerpc/include/asm/spu*.h
 F:      arch/powerpc/oprofile/*cell*
 F:      arch/powerpc/platforms/cell/
 
+CEPH DISTRIBUTED FILE SYSTEM CLIENT
+M:      Sage Weil <sage@newdream.net>
+L:      ceph-devel@vger.kernel.org
+W:      http://ceph.newdream.net/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
+S:      Supported
+F:      Documentation/filesystems/ceph.txt
+F:      fs/ceph
+
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 M:      David Vrabel <david.vrabel@csr.com>
 L:      linux-usb@vger.kernel.org
@@ -1483,9 +1527,10 @@ M:	Andy Whitcroft <apw@canonical.com>
 S:      Supported
 F:      scripts/checkpatch.pl
 
-CISCO 10G ETHERNET DRIVER
+CISCO VIC ETHERNET NIC DRIVER
 M:      Scott Feldman <scofeldm@cisco.com>
-M:      Joe Eykholt <jeykholt@cisco.com>
+M:      Vasanthy Kolluri <vkolluri@cisco.com>
+M:      Roopa Prabhu <roprabhu@cisco.com>
 S:      Supported
 F:      drivers/net/enic/
 
@@ -1537,7 +1582,7 @@ F:	include/linux/coda*.h
 
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:      Steve French <sfrench@samba.org>
-L:      linux-cifs-client@lists.samba.org (moderated for non-subscribers)
+L:      linux-cifs@vger.kernel.org
 L:      samba-technical@lists.samba.org (moderated for non-subscribers)
 W:      http://linux-cifs.samba.org/
 Q:      http://patchwork.ozlabs.org/project/linux-cifs-client/list/
@@ -1687,7 +1732,7 @@ S:	Maintained
 F:      sound/pci/cs5535audio/
 
 CX18 VIDEO4LINUX DRIVER
-M:      Andy Walls <awalls@radix.net>
+M:      Andy Walls <awalls@md.metrocast.net>
 L:      ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -1711,6 +1756,27 @@ W:	http://www.openfabrics.org
 S:      Supported
 F:      drivers/infiniband/hw/cxgb3/
 
+CXGB4 ETHERNET DRIVER (CXGB4)
+M:      Dimitris Michailidis <dm@chelsio.com>
+L:      netdev@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+F:      drivers/net/cxgb4/
+
+CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
+M:      Steve Wise <swise@chelsio.com>
+L:      linux-rdma@vger.kernel.org
+W:      http://www.openfabrics.org
+S:      Supported
+F:      drivers/infiniband/hw/cxgb4/
+
+CXGB4VF ETHERNET DRIVER (CXGB4VF)
+M:      Casey Leedom <leedom@chelsio.com>
+L:      netdev@vger.kernel.org
+W:      http://www.chelsio.com
+S:      Supported
+F:      drivers/net/cxgb4vf/
+
 CYBERPRO FB DRIVER
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1918,17 +1984,17 @@ F:	drivers/scsi/dpt*
 F:      drivers/scsi/dpt/
 
 DRBD DRIVER
-P:     Philipp Reisner
-P:     Lars Ellenberg
-M:     drbd-dev@lists.linbit.com
-L:     drbd-user@lists.linbit.com
-W:     http://www.drbd.org
-T:     git git://git.drbd.org/linux-2.6-drbd.git drbd
-T:     git git://git.drbd.org/drbd-8.3.git
-S:     Supported
-F:     drivers/block/drbd/
-F:     lib/lru_cache.c
-F:     Documentation/blockdev/drbd/
+P:      Philipp Reisner
+P:      Lars Ellenberg
+M:      drbd-dev@lists.linbit.com
+L:      drbd-user@lists.linbit.com
+W:      http://www.drbd.org
+T:      git git://git.drbd.org/linux-2.6-drbd.git drbd
+T:      git git://git.drbd.org/drbd-8.3.git
+S:      Supported
+F:      drivers/block/drbd/
+F:      lib/lru_cache.c
+F:      Documentation/blockdev/drbd/
 
 DRIVER CORE, KOBJECTS, AND SYSFS
 M:      Greg Kroah-Hartman <gregkh@suse.de>
@@ -1942,7 +2008,7 @@ F:	lib/kobj*
 
 DRM DRIVERS
 M:      David Airlie <airlied@linux.ie>
-L:      dri-devel@lists.sourceforge.net
+L:      dri-devel@lists.freedesktop.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:      Maintained
 F:      drivers/gpu/drm/
@@ -2051,11 +2117,20 @@ F:	drivers/edac/i5000_edac.c
 
 EDAC-I5400
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
-L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:      linux-edac@vger.kernel.org
 W:      bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/i5400_edac.c
 
+EDAC-I7CORE
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-edac@vger.kernel.org
+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 <ravi@jetztechnologies.com>
 M:      "Arvind R." <arvind@jetztechnologies.com>
@@ -2466,12 +2541,6 @@ L:	linuxppc-dev@ozlabs.org
 S:      Odd Fixes
 F:      drivers/char/hvc_*
 
-VIRTIO CONSOLE DRIVER
-M:      Amit Shah <amit.shah@redhat.com>
-L:      virtualization@lists.linux-foundation.org
-S:      Maintained
-F:      drivers/char/virtio_console.c
-
 iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 M:      Peter Jones <pjones@redhat.com>
 M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
@@ -2557,6 +2626,14 @@ S:	Maintained
 F:      Documentation/blockdev/cpqarray.txt
 F:      drivers/block/cpqarray.*
 
+HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
+M:      Stephen M. Cameron <scameron@beardog.cce.hp.com>
+L:      iss_storagedev@hp.com
+S:      Supported
+F:      Documentation/scsi/hpsa.txt
+F:      drivers/scsi/hpsa*.[ch]
+F:      include/linux/cciss*.h
+
 HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 M:      Mike Miller <mike.miller@hp.com>
 L:      iss_storagedev@hp.com
@@ -2655,16 +2732,12 @@ F:	Documentation/timers/hpet.txt
 F:      drivers/char/hpet.c
 F:      include/linux/hpet.h
 
-HPET:   i386
-M:      "Venkatesh Pallipadi (Venki)" <venkatesh.pallipadi@intel.com>
+HPET:   x86
+M:      "Venkatesh Pallipadi (Venki)" <venki@google.com>
 S:      Maintained
 F:      arch/x86/kernel/hpet.c
 F:      arch/x86/include/asm/hpet.h
 
-HPET:   x86_64
-M:      Vojtech Pavlik <vojtech@suse.cz>
-S:      Maintained
-
 HPET:   ACPI
 M:      Bob Picco <bob.picco@hp.com>
 S:      Maintained
@@ -2705,6 +2778,7 @@ M:	"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
 L:      linux-i2c@vger.kernel.org
 W:      http://i2c.wiki.kernel.org/
 T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
+T:      git git://git.fluff.org/bjdooks/linux.git
 S:      Maintained
 F:      Documentation/i2c/
 F:      drivers/i2c/
@@ -2838,6 +2912,20 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
 S:      Maintained
 F:      drivers/input/
 
+INPUT MULTITOUCH (MT) PROTOCOL
+M:      Henrik Rydberg <rydberg@euromail.se>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      Documentation/input/multi-touch-protocol.txt
+K:      \b(ABS|SYN)_MT_
+
+INTEL IDLE DRIVER
+M:      Len Brown <lenb@kernel.org>
+L:      linux-pm@lists.linux-foundation.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
+
 INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 M:      Maik Broemme <mbroemme@plusserver.de>
 L:      linux-fbdev@vger.kernel.org
@@ -2922,25 +3010,28 @@ F:	drivers/net/ixgb/
 F:      drivers/net/ixgbe/
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
-M:      Zhu Yi <yi.zhu@intel.com>
-M:      Reinette Chatre <reinette.chatre@intel.com>
-M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://ipw2100.sourceforge.net
-S:      Odd Fixes
+S:      Orphan
 F:      Documentation/networking/README.ipw2100
 F:      drivers/net/wireless/ipw2x00/ipw2100.*
 
 INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
-M:      Zhu Yi <yi.zhu@intel.com>
-M:      Reinette Chatre <reinette.chatre@intel.com>
-M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://ipw2200.sourceforge.net
-S:      Odd Fixes
+S:      Orphan
 F:      Documentation/networking/README.ipw2200
 F:      drivers/net/wireless/ipw2x00/ipw2200.*
 
+INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
+M:      Joseph Cihula <joseph.cihula@intel.com>
+M:      Shane Wang <shane.wang@intel.com>
+L:      tboot-devel@lists.sourceforge.net
+W:      http://tboot.sourceforge.net
+T:      Mercurial http://www.bughost.org/repos.hg/tboot.hg
+S:      Supported
+F:      Documentation/intel_txt.txt
+F:      include/linux/tboot.h
+F:      arch/x86/kernel/tboot.c
+
 INTEL WIRELESS WIMAX CONNECTION 2400
 M:      Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:      linux-wimax@intel.com
@@ -2952,8 +3043,8 @@ F:	drivers/net/wimax/i2400m/
 F:      include/linux/wimax/i2400m.h
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
-M:      Zhu Yi <yi.zhu@intel.com>
 M:      Reinette Chatre <reinette.chatre@intel.com>
+M:      Wey-Yi Guy <wey-yi.w.guy@intel.com>
 M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
 W:      http://intellinuxwireless.org
@@ -2963,7 +3054,6 @@ F:	drivers/net/wireless/iwlwifi/
 
 INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
 M:      Samuel Ortiz <samuel.ortiz@intel.com>
-M:      Zhu Yi <yi.zhu@intel.com>
 M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
 S:      Supported
@@ -2990,10 +3080,9 @@ F:	net/ipv4/netfilter/ipt_MASQUERADE.c
 IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
 M:      Sorbica Shieh <sorbica@icplus.com.tw>
-M:      Jesse Huang <jesse@icplus.com.tw>
 L:      netdev@vger.kernel.org
 S:      Maintained
-F:      drivers/net/ipg.c
+F:      drivers/net/ipg.*
 
 IPATH DRIVER
 M:      Ralph Campbell <infinipath@qlogic.com>
@@ -3075,6 +3164,7 @@ F:	include/scsi/*iscsi*
 ISDN SUBSYSTEM
 M:      Karsten Keil <isdn@linux-pingi.de>
 L:      isdn4linux@listserv.isdn4linux.de (subscribers-only)
+L:      netdev@vger.kernel.org
 W:      http://www.isdn4linux.de
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
 S:      Maintained
@@ -3098,7 +3188,7 @@ F:	Documentation/hwmon/it87
 F:      drivers/hwmon/it87.c
 
 IVTV VIDEO4LINUX DRIVER
-M:      Andy Walls <awalls@radix.net>
+M:      Andy Walls <awalls@md.metrocast.net>
 L:      ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
@@ -3175,7 +3265,7 @@ L:	autofs@linux.kernel.org
 S:      Maintained
 F:      fs/autofs4/
 
-KERNEL BUILD
+KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:      Michal Marek <mmarek@suse.cz>
 T:      git git://repo.or.cz/linux-kbuild.git for-next
 T:      git git://repo.or.cz/linux-kbuild.git for-linus
@@ -3184,6 +3274,9 @@ S:	Maintained
 F:      Documentation/kbuild/
 F:      Makefile
 F:      scripts/Makefile.*
+F:      scripts/basic/
+F:      scripts/mk*
+F:      scripts/package/
 
 KERNEL JANITORS
 L:      kernel-janitors@vger.kernel.org
@@ -3261,15 +3354,27 @@ S:	Maintained
 F:      include/linux/kexec.h
 F:      kernel/kexec.c
 
-KGDB
+KEYS/KEYRINGS:
+M:      David Howells <dhowells@redhat.com>
+L:      keyrings@linux-nfs.org
+S:      Maintained
+F:      Documentation/keys.txt
+F:      include/linux/key.h
+F:      include/linux/key-type.h
+F:      include/keys/
+F:      security/keys/
+
+KGDB / KDB /debug_core
 M:      Jason Wessel <jason.wessel@windriver.com>
+W:      http://kgdb.wiki.kernel.org/
 L:      kgdb-bugreport@lists.sourceforge.net
 S:      Maintained
 F:      Documentation/DocBook/kgdb.tmpl
 F:      drivers/misc/kgdbts.c
 F:      drivers/serial/kgdboc.c
+F:      include/linux/kdb.h
 F:      include/linux/kgdb.h
-F:      kernel/kgdb.c
+F:      kernel/debug/
 
 KMEMCHECK
 M:      Vegard Nossum <vegardno@ifi.uio.no>
@@ -3300,7 +3405,7 @@ KPROBES
 M:      Ananth N Mavinakayanahalli <ananth@in.ibm.com>
 M:      Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 M:      "David S. Miller" <davem@davemloft.net>
-M:      Masami Hiramatsu <mhiramat@redhat.com>
+M:      Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
 S:      Maintained
 F:      Documentation/kprobes.txt
 F:      include/linux/kprobes.h
@@ -3421,9 +3526,8 @@ F:	arch/powerpc/platforms/83xx/
 
 LINUX FOR POWERPC PA SEMI PWRFICIENT
 M:      Olof Johansson <olof@lixom.net>
-W:      http://www.pasemi.com/
 L:      linuxppc-dev@ozlabs.org
-S:      Supported
+S:      Maintained
 F:      arch/powerpc/platforms/pasemi/
 F:      drivers/*/*pasemi*
 F:      drivers/*/*/*pasemi*
@@ -3510,8 +3614,8 @@ F:	drivers/scsi/sym53c8xx_2/
 LTP (Linux Test Project)
 M:      Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
 M:      Garrett Cooper <yanegomi@gmail.com>
-M:     Mike Frysinger <vapier@gentoo.org>
-M:     Subrata Modak <subrata@linux.vnet.ibm.com>
+M:      Mike Frysinger <vapier@gentoo.org>
+M:      Subrata Modak <subrata@linux.vnet.ibm.com>
 L:      ltp-list@lists.sourceforge.net (subscribers-only)
 W:      http://ltp.sourceforge.net/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
@@ -3596,12 +3700,13 @@ F:	include/linux/mv643xx.h
 MARVELL MWL8K WIRELESS DRIVER
 M:      Lennert Buytenhek <buytenh@wantstofly.org>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Odd Fixes
 F:      drivers/net/wireless/mwl8k.c
 
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:      Nicolas Pitre <nico@fluxnic.net>
-S:      Maintained
+S:      Odd Fixes
+F: drivers/mmc/host/mvsdio.*
 
 MARVELL YUKON / SYSKONNECT DRIVER
 M:      Mirko Lindner <mlindner@syskonnect.de>
@@ -3824,18 +3929,19 @@ L:	netem@lists.linux-foundation.org
 S:      Maintained
 F:      net/sched/sch_netem.c
 
-NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
-M:      Ramkrishna Vepa <ram.vepa@neterion.com>
-M:      Rastapur Santosh <santosh.rastapur@neterion.com>
-M:      Sivakumar Subramani <sivakumar.subramani@neterion.com>
-M:      Sreenivasa Honnur <sreenivasa.honnur@neterion.com>
-M:      Anil Murthy <anil.murthy@neterion.com>
+NETERION 10GbE DRIVERS (s2io/vxge)
+M:      Ramkrishna Vepa <ramkrishna.vepa@exar.com>
+M:      Sivakumar Subramani <sivakumar.subramani@exar.com>
+M:      Sreenivasa Honnur <sreenivasa.honnur@exar.com>
+M:      Jon Mason <jon.mason@exar.com>
 L:      netdev@vger.kernel.org
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 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/
 
 NETFILTER/IPTABLES/IPCHAINS
 P:      Rusty Russell
@@ -3934,6 +4040,7 @@ F:	net/rfkill/
 F:      net/wireless/
 F:      include/net/ieee80211*
 F:      include/linux/wireless.h
+F:      include/linux/iw_handler.h
 F:      drivers/net/wireless/
 
 NETWORKING DRIVERS
@@ -4133,6 +4240,7 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:      Grant Likely <grant.likely@secretlab.ca>
 L:      devicetree-discuss@lists.ozlabs.org
 W:      http://fdt.secretlab.ca
+T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
 F:      drivers/of
 F:      include/linux/of*.h
@@ -4142,6 +4250,7 @@ OPROFILE
 M:      Robert Richter <robert.richter@amd.com>
 L:      oprofile-list@lists.sf.net
 S:      Maintained
+F:      arch/*/include/asm/oprofile*.h
 F:      arch/*/oprofile/
 F:      drivers/oprofile/
 F:      include/linux/oprofile.h
@@ -4179,10 +4288,9 @@ F:	include/scsi/osd_*
 F:      fs/exofs/
 
 P54 WIRELESS DRIVER
-M:      Michael Wu <flamingice@sourmilk.net>
+M:      Christian Lamparter <chunkeey@googlemail.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://prism54.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+W:      http://wireless.kernel.org/en/users/Drivers/p54
 S:      Maintained
 F:      drivers/net/wireless/p54/
 
@@ -4330,13 +4438,13 @@ M:	Paul Mackerras <paulus@samba.org>
 M:      Ingo Molnar <mingo@elte.hu>
 M:      Arnaldo Carvalho de Melo <acme@redhat.com>
 S:      Supported
-F:      kernel/perf_event.c
+F:      kernel/perf_event*.c
 F:      include/linux/perf_event.h
-F:      arch/*/kernel/perf_event.c
-F:      arch/*/kernel/*/perf_event.c
-F:      arch/*/kernel/*/*/perf_event.c
+F:      arch/*/kernel/perf_event*.c
+F:      arch/*/kernel/*/perf_event*.c
+F:      arch/*/kernel/*/*/perf_event*.c
 F:      arch/*/include/asm/perf_event.h
-F:      arch/*/lib/perf_event.c
+F:      arch/*/lib/perf_event*.c
 F:      arch/*/kernel/perf_callchain.c
 F:      tools/perf/
 
@@ -4444,7 +4552,7 @@ PRISM54 WIRELESS DRIVER
 M:      "Luis R. Rodriguez" <mcgrof@gmail.com>
 L:      linux-wireless@vger.kernel.org
 W:      http://prism54.org
-S:      Maintained
+S:      Obsolete
 F:      drivers/net/wireless/prism54/
 
 PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
@@ -4459,17 +4567,17 @@ S:	Maintained
 F:      drivers/ata/sata_promise.*
 
 PS3 NETWORK SUPPORT
-M:      Geoff Levand <geoffrey.levand@am.sony.com>
+M:      Geoff Levand <geoff@infradead.org>
 L:      netdev@vger.kernel.org
 L:      cbe-oss-dev@ozlabs.org
-S:      Supported
+S:      Maintained
 F:      drivers/net/ps3_gelic_net.*
 
 PS3 PLATFORM SUPPORT
-M:      Geoff Levand <geoffrey.levand@am.sony.com>
+M:      Geoff Levand <geoff@infradead.org>
 L:      linuxppc-dev@ozlabs.org
 L:      cbe-oss-dev@ozlabs.org
-S:      Supported
+S:      Maintained
 F:      arch/powerpc/boot/ps3*
 F:      arch/powerpc/include/asm/lv1call.h
 F:      arch/powerpc/include/asm/ps3*.h
@@ -4546,6 +4654,12 @@ M:	Robert Jarzmik <robert.jarzmik@free.fr>
 L:      rtc-linux@googlegroups.com
 S:      Maintained
 
+QLOGIC QLA1280 SCSI DRIVER
+M:      Michael Reed <mdr@sgi.com>
+L:      linux-scsi@vger.kernel.org
+S:      Maintained
+F:      drivers/scsi/qla1280.[ch]
+
 QLOGIC QLA2XXX FC-SCSI DRIVER
 M:      Andrew Vasquez <andrew.vasquez@qlogic.com>
 M:      linux-driver@qlogic.com
@@ -4554,6 +4668,14 @@ S:	Supported
 F:      Documentation/scsi/LICENSE.qla2xxx
 F:      drivers/scsi/qla2xxx/
 
+QLOGIC QLA4XXX iSCSI DRIVER
+M:      Ravi Anand <ravi.anand@qlogic.com>
+M:      Vikas Chaudhary <vikas.chaudhary@qlogic.com>
+M:      iscsi-driver@qlogic.com
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/qla4xxx/
+
 QLOGIC QLA3XXX NETWORK DRIVER
 M:      Ron Mercer <ron.mercer@qlogic.com>
 M:      linux-driver@qlogic.com
@@ -4564,6 +4686,7 @@ F:	drivers/net/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 M:      Amit Kumar Salecha <amit.salecha@qlogic.com>
+M:      Anirban Chakraborty <anirban.chakraborty@qlogic.com>
 M:      linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
@@ -4625,9 +4748,8 @@ S:	Maintained
 F:      drivers/rapidio/
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
-M:      Corey Thomas <coreythomas@charter.net>
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
@@ -4693,6 +4815,12 @@ S:	Maintained
 F:      Documentation/rfkill.txt
 F:      net/rfkill/
 
+RICOH SMARTMEDIA/XD DRIVER
+M:      Maxim Levitsky <maximlevitsky@gmail.com>
+S:      Maintained
+F:      drivers/mtd/nand/r822.c
+F:      drivers/mtd/nand/r822.h
+
 RISCOM8 DRIVER
 S:      Orphan
 F:      Documentation/serial/riscom8.txt
@@ -4747,6 +4875,9 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      arch/s390/
 F:      drivers/s390/
+F:      fs/partitions/ibm.c
+F:      Documentation/s390/
+F:      Documentation/DocBook/s390*
 
 S390 NETWORK DRIVERS
 M:      Ursula Braun <ursula.braun@de.ibm.com>
@@ -4768,12 +4899,11 @@ F:	drivers/s390/crypto/
 
 S390 ZFCP DRIVER
 M:      Christof Schmitt <christof.schmitt@de.ibm.com>
-M:      Martin Peschke <mp3@de.ibm.com>
+M:      Swen Schillig <swen@vnet.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
-F:      Documentation/s390/zfcpdump.txt
 F:      drivers/s390/scsi/zfcp_*
 
 S390 IUCV NETWORK LAYER
@@ -4916,6 +5046,12 @@ L:	linux-mmc@vger.kernel.org
 S:      Maintained
 F:      drivers/mmc/host/sdhci-s3c.c
 
+SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
+M:      Viresh Kumar <viresh.kumar@st.com>
+L:      linux-mmc@vger.kernel.org
+S:      Maintained
+F:      drivers/mmc/host/sdhci-spear.c
+
 SECURITY SUBSYSTEM
 M:      James Morris <jmorris@namei.org>
 L:      linux-security-module@vger.kernel.org (suggested Cc:)
@@ -4939,6 +5075,14 @@ S:	Supported
 F:      include/linux/selinux*
 F:      security/selinux/
 
+APPARMOR SECURITY MODULE
+M:      John Johansen <john.johansen@canonical.com>
+L:      apparmor@lists.ubuntu.com (subscribers-only, general discussion)
+W:      apparmor.wiki.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
+S:      Supported
+F:      security/apparmor/
+
 SENSABLE PHANTOM
 M:      Jiri Slaby <jirislaby@gmail.com>
 S:      Maintained
@@ -5099,7 +5243,7 @@ F:	mm/sl?b.c
 
 SMC91x ETHERNET DRIVER
 M:      Nicolas Pitre <nico@fluxnic.net>
-S:      Maintained
+S:      Odd Fixes
 F:      drivers/net/smc91x.*
 
 SMSC47B397 HARDWARE MONITOR DRIVER
@@ -5214,6 +5358,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 S:      Maintained
 F:      arch/sparc/
+F:      drivers/sbus
 
 SPARC SERIAL DRIVERS
 M:      "David S. Miller" <davem@davemloft.net>
@@ -5230,6 +5375,46 @@ F:	drivers/serial/sunsu.c
 F:      drivers/serial/sunzilog.c
 F:      drivers/serial/sunzilog.h
 
+SPEAR PLATFORM SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/plat-spear/
+
+SPEAR3XX MACHINE SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/mach-spear3xx/
+
+SPEAR6XX MACHINE SUPPORT
+M:      Rajeev Kumar <rajeev-dlh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/mach-spear6xx/
+
+SPEAR CLOCK FRAMEWORK SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/mach-spear*/clock.c
+F:      arch/arm/mach-spear*/include/mach/clkdev.h
+F:      arch/arm/plat-spear/clock.c
+F:      arch/arm/plat-spear/include/plat/clock.h and clkdev.h
+
+SPEAR PAD MULTIPLEXING SUPPORT
+M:      Viresh Kumar <viresh.kumar@st.com>
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/plat-spear/include/plat/padmux.h
+F:      arch/arm/plat-spear/padmux.c
+F:      arch/arm/mach-spear*/spear*xx.c
+F:      arch/arm/mach-spear*/include/mach/generic.h
+F:      arch/arm/mach-spear3xx/spear3*0.c
+F:      arch/arm/mach-spear3xx/spear3*0_evb.c
+F:      arch/arm/mach-spear6xx/spear600.c
+F:      arch/arm/mach-spear6xx/spear600_evb.c
+
 SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
 M:      Roger Wolff <R.E.Wolff@BitWizard.nl>
 S:      Supported
@@ -5241,6 +5426,7 @@ M:	David Brownell <dbrownell@users.sourceforge.net>
 M:      Grant Likely <grant.likely@secretlab.ca>
 L:      spi-devel-general@lists.sourceforge.net
 Q:      http://patchwork.kernel.org/project/spi-devel-general/list/
+T:      git git://git.secretlab.ca/git/linux-2.6.git
 S:      Maintained
 F:      Documentation/spi/
 F:      drivers/spi/
@@ -5415,7 +5601,6 @@ S:	Maintained
 F:      sound/soc/codecs/twl4030*
 
 TIPC NETWORK LAYER
-M:      Per Liden <per.liden@ericsson.com>
 M:      Jon Maloy <jon.maloy@ericsson.com>
 M:      Allan Stephens <allan.stephens@windriver.com>
 L:      tipc-discussion@lists.sourceforge.net
@@ -5442,7 +5627,7 @@ L:	tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and us
 L:      tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
 L:      tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
 W:      http://tomoyo.sourceforge.jp/
-T:      quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches/
+T:      quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.3.x/tomoyo-lsm/patches/
 S:      Maintained
 F:      security/tomoyo/
 
@@ -5471,7 +5656,7 @@ S:	Maintained
 F:      drivers/mmc/host/tmio_mmc.*
 
 TMPFS (SHMEM FILESYSTEM)
-M:      Hugh Dickins <hugh.dickins@tiscali.co.uk>
+M:      Hugh Dickins <hughd@google.com>
 L:      linux-mm@kvack.org
 S:      Maintained
 F:      include/linux/shmem_fs.h
@@ -5859,7 +6044,7 @@ M:	Laurent Pinchart <laurent.pinchart@skynet.be>
 L:      linux-uvc-devel@lists.berlios.de (subscribers-only)
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-W:      http://linux-uvc.berlios.de
+W:      http://www.ideasonboard.org/uvc/
 S:      Maintained
 F:      drivers/media/video/uvc/
 
@@ -5897,10 +6082,9 @@ F:	Documentation/video4linux/zc0301.txt
 F:      drivers/media/video/zc0301/
 
 USB ZD1201 DRIVER
-M:      Jeroen Vreeken <pe1rxq@amsat.org>
-L:      linux-usb@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 W:      http://linux-lc100020.sourceforge.net
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/zd1201.*
 
 USB ZR364XX DRIVER
@@ -5953,6 +6137,13 @@ S:	Maintained
 F:      Documentation/filesystems/vfat.txt
 F:      fs/fat/
 
+VIRTIO CONSOLE DRIVER
+M:      Amit Shah <amit.shah@redhat.com>
+L:      virtualization@lists.linux-foundation.org
+S:      Maintained
+F:      drivers/char/virtio_console.c
+F:      include/linux/virtio_console.h
+
 VIRTIO HOST (VHOST)
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
@@ -6073,20 +6264,14 @@ F:	drivers/mmc/host/wbsd.*
 
 WATCHDOG DEVICE DRIVERS
 M:      Wim Van Sebroeck <wim@iguana.be>
+L:      linux-watchdog@vger.kernel.org
+W:      http://www.linux-watchdog.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
 S:      Maintained
 F:      Documentation/watchdog/
 F:      drivers/watchdog/
 F:      include/linux/watchdog.h
 
-WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
-M:      Jean Tourrilhes <jt@hpl.hp.com>
-L:      linux-wireless@vger.kernel.org
-W:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
-S:      Maintained
-F:      Documentation/networking/wavelan.txt
-F:      drivers/staging/wavelan/
-
 WD7000 SCSI DRIVER
 M:      Miroslav Zagorac <zaga@fly.cc.fer.hr>
 L:      linux-scsi@vger.kernel.org
@@ -6193,7 +6378,7 @@ F:	arch/x86/
 X86 PLATFORM DRIVERS
 M:      Matthew Garrett <mjg@redhat.com>
 L:      platform-driver-x86@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
 S:      Maintained
 F:      drivers/platform/x86