Merge branch 'master' into for-upstream

Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile

diff --combined Documentation/ABI/testing/sysfs-bus-usb
index 273a7f099f46d49fdbcc63a44c13c33a635cd11b,df6c8a0159f1c9abeaf54931384fdf36255f60a5..7772928ee48f6edfa61d52921164ed106501515b
--- 1/Documentation/ABI/testing/sysfs-bus-usb
--- 2/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@@ -86,45 -86,18 +86,61 @@@ Users
                PowerTOP <power@bughost.org>
                http://www.lesswatts.org/projects/powertop/
  
+ What:         /sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend
+ Date:         January 2008
+ KernelVersion:        2.6.27
+ Contact:      Sarah Sharp <sarah.a.sharp@intel.com>
+ Description:
+               When read, this file returns 1 if the interface driver
+               for this interface supports autosuspend.  It also
+               returns 1 if no driver has claimed this interface, as an
+               unclaimed interface will not stop the device from being
+               autosuspended if all other interface drivers are idle.
+               The file returns 0 if autosuspend support has not been
+               added to the driver.
+ Users:
+               USB PM tool
+               git://git.moblin.org/users/sarah/usb-pm-tool/
++
 +What:         /sys/bus/usb/device/.../authorized
 +Date:         July 2008
 +KernelVersion:        2.6.26
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              Authorized devices are available for use by device
 +              drivers, non-authorized one are not.  By default, wired
 +              USB devices are authorized.
 +
 +              Certified Wireless USB devices are not authorized
 +              initially and should be (by writing 1) after the
 +              device has been authenticated.
 +
 +What:         /sys/bus/usb/device/.../wusb_cdid
 +Date:         July 2008
 +KernelVersion:        2.6.27
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              For Certified Wireless USB devices only.
 +
 +              A devices's CDID, as 16 space-separated hex octets.
 +
 +What:         /sys/bus/usb/device/.../wusb_ck
 +Date:         July 2008
 +KernelVersion:        2.6.27
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              For Certified Wireless USB devices only.
 +
 +              Write the device's connection key (CK) to start the
 +              authentication of the device.  The CK is 16
 +              space-separated hex octets.
 +
 +What:         /sys/bus/usb/device/.../wusb_disconnect
 +Date:         July 2008
 +KernelVersion:        2.6.27
 +Contact:      David Vrabel <david.vrabel@csr.com>
 +Description:
 +              For Certified Wireless USB devices only.
 +
 +              Write a 1 to force the device to disconnect
 +              (equivalent to unplugging a wired USB device).

diff --combined MAINTAINERS
index 4674c64308a4dd11e0cdc83b554f4ebdc4bc348e,355c192d699779f773259ddd647b64d574021cfe..2085286210457ed69a280e1bd21e58b7184b2c4d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -72,6 -72,7 +72,7 @@@ M: Mail patches t
  L: Mailing list that is relevant to this area
  W: Web-page with status/info
  T: SCM tree type and location.  Type is one of: git, hg, quilt.
+ F: Applicable files and/or directories
  S: Status, one of the following:
  
        Supported:      Someone is actually paid to look after this.
@@@ -102,14 -103,14 +103,14 @@@ M:      dave@thedillows.or
  L:    netdev@vger.kernel.org
  S:    Maintained
  
- 3W-XXXX ATA-RAID CONTROLLER DRIVER
+ 3W-9XXX SATA-RAID CONTROLLER DRIVER
  P:    Adam Radford
  M:    linuxraid@amcc.com
  L:    linux-scsi@vger.kernel.org
  W:    http://www.amcc.com
  S:    Supported
  
- 3W-9XXX SATA-RAID CONTROLLER DRIVER
+ 3W-XXXX ATA-RAID CONTROLLER DRIVER
  P:    Adam Radford
  M:    linuxraid@amcc.com
  L:    linux-scsi@vger.kernel.org
@@@ -163,16 -164,11 +164,11 @@@ M:      A2232@gmx.ne
  L:    linux-m68k@lists.linux-m68k.org
  S:    Maintained
  
- AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
- P:    David Howells
- M:    dhowells@redhat.com
- L:    linux-afs@lists.infradead.org
- S:    Supported
- 
- AIO
- P:    Benjamin LaHaise
- M:    bcrl@kvack.org
- L:    linux-aio@kvack.org
+ AACRAID SCSI RAID DRIVER
+ P:    Adaptec OEM Raid Solutions
+ M:    aacraid@adaptec.com
+ L:    linux-scsi@vger.kernel.org
+ W:    http://www.adaptec.com/
  S:    Supported
  
  ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
@@@ -193,27 -189,6 +189,6 @@@ M:        jes@trained-monkey.or
  L:    linux-acenic@sunsite.dk
  S:    Maintained
  
- IPS SCSI RAID DRIVER
- P:    Adaptec OEM Raid Solutions
- M:    aacraid@adaptec.com
- L:    linux-scsi@vger.kernel.org
- W:    http://www.adaptec.com/
- S:    Maintained
- 
- DPT_I2O SCSI RAID DRIVER
- P:    Adaptec OEM Raid Solutions
- M:    aacraid@adaptec.com
- L:    linux-scsi@vger.kernel.org
- W:    http://www.adaptec.com/
- S:    Maintained
- 
- AACRAID SCSI RAID DRIVER
- P:    Adaptec OEM Raid Solutions
- M:    aacraid@adaptec.com
- L:    linux-scsi@vger.kernel.org
- W:    http://www.adaptec.com/
- S:    Supported
- 
  ACER WMI LAPTOP EXTRAS
  P:    Carlos Corbacho
  M:    carlos@strangeworlds.co.uk
@@@ -327,6 -302,12 +302,12 @@@ P:       Roman Zippe
  M:    zippel@linux-m68k.org
  S:    Maintained
  
+ AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN
+ P:    David Howells
+ M:    dhowells@redhat.com
+ L:    linux-afs@lists.infradead.org
+ S:    Supported
+ 
  AGPGART DRIVER
  P:    David Airlie
  M:    airlied@linux.ie
@@@ -345,6 -326,12 +326,12 @@@ M:       hare@suse.d
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
+ AIO
+ P:    Benjamin LaHaise
+ M:    bcrl@kvack.org
+ L:    linux-aio@kvack.org
+ S:    Supported
+ 
  ALCATEL SPEEDTOUCH USB DRIVER
  P:    Duncan Sands
  M:    duncan.sands@free.fr
@@@ -387,8 -374,14 +374,14 @@@ AMD IOMMU (AMD-VI
  P:    Joerg Roedel
  M:    joerg.roedel@amd.com
  L:    iommu@lists.linux-foundation.org
+ T:    git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
  S:    Supported
  
+ AMD MICROCODE UPDATE SUPPORT
+ P:      Peter Oruba
+ M:      peter.oruba@amd.com
+ S:      Supported
+ 
  AMS (Apple Motion Sensor) DRIVER
  P:    Stelian Pop
  M:    stelian@popies.net
@@@ -466,6 -459,12 +459,12 @@@ M:       kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
+ ARM/AFEB9260 MACHINE SUPPORT
+ P:    Sergey Lapin
+ M:    slapin@ossfans.org
+ L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+ S:    Maintained
+ 
  ARM/AJECO 1ARM MACHINE SUPPORT
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
@@@ -491,7 -490,7 +490,7 @@@ M: kernel@wantstofly.or
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  S:    Maintained
  
- ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT
+ ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
  P:    Mike Rapoport
  M:    mike@compulab.co.il
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@@ -623,6 -622,12 +622,12 @@@ M:       marek.vasut@gmail.co
  W:    http://hackndev.com
  S:    Maintained
  
+ ARM/PALMZ72 SUPPORT
+ P:     Sergey Lapin
+ M:     slapin@ossfans.org
+ W:     http://hackndev.com
+ S:     Maintained
+ 
  ARM/PLEB SUPPORT
  P:    Peter Chubb
  M:    pleb@gelato.unsw.edu.au
@@@ -719,7 -724,7 +724,7 @@@ L: linux-kernel@vger.kernel.or
  W:    http://sourceforge.net/projects/xscaleiop
  S:    Supported
  
- ATA OVER ETHERNET DRIVER
+ ATA OVER ETHERNET (AOE) DRIVER
  P:    Ed L. Cashin
  M:    ecashin@coraid.com
  W:    http://www.coraid.com/support/linux
@@@ -852,11 -857,48 +857,48 @@@ L:      linux-hams@vger.kernel.or
  W:    http://www.linux-ax25.org/
  S:    Maintained
  
+ B43 WIRELESS DRIVER
+ P:    Michael Buesch
+ M:    mb@bu3sch.de
+ P:    Stefano Brivio
+ M:    stefano.brivio@polimi.it
+ L:    linux-wireless@vger.kernel.org
+ W:    http://linuxwireless.org/en/users/Drivers/b43
+ S:    Maintained
+ 
+ B43LEGACY WIRELESS DRIVER
+ P:    Larry Finger
+ M:    Larry.Finger@lwfinger.net
+ P:    Stefano Brivio
+ M:    stefano.brivio@polimi.it
+ L:    linux-wireless@vger.kernel.org
+ W:    http://linuxwireless.org/en/users/Drivers/b43
+ S:    Maintained
+ 
  BACKLIGHT CLASS/SUBSYSTEM
  P:    Richard Purdie
  M:    rpurdie@rpsys.net
  S:    Maintained
  
+ BAYCOM/HDLCDRV DRIVERS FOR AX.25
+ P:    Thomas Sailer
+ M:    t.sailer@alumni.ethz.ch
+ L:    linux-hams@vger.kernel.org
+ W:    http://www.baycom.org/~tom/ham/ham.html
+ S:    Maintained
+ 
+ BEFS FILE SYSTEM
+ P:    Sergey S. Kostyliov
+ M:    rathamahata@php4.ru
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ 
+ BFS FILE SYSTEM
+ P:    Tigran A. Aivazian
+ M:    tigran@aivazian.fsnet.co.uk
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ 
  BLACKFIN ARCHITECTURE
  P:    Bryan Wu
  M:    cooloney@kernel.org
@@@ -892,43 -934,6 +934,6 @@@ L:        uclinux-dist-devel@blackfin.uclinux.
  W:    http://blackfin.uclinux.org
  S:    Supported
  
- BAYCOM/HDLCDRV DRIVERS FOR AX.25
- P:    Thomas Sailer
- M:    t.sailer@alumni.ethz.ch
- L:    linux-hams@vger.kernel.org
- W:    http://www.baycom.org/~tom/ham/ham.html
- S:    Maintained
- 
- B43 WIRELESS DRIVER
- P:    Michael Buesch
- M:    mb@bu3sch.de
- P:    Stefano Brivio
- M:    stefano.brivio@polimi.it
- L:    linux-wireless@vger.kernel.org
- W:    http://linuxwireless.org/en/users/Drivers/b43
- S:    Maintained
- 
- B43LEGACY WIRELESS DRIVER
- P:    Larry Finger
- M:    Larry.Finger@lwfinger.net
- P:    Stefano Brivio
- M:    stefano.brivio@polimi.it
- L:    linux-wireless@vger.kernel.org
- W:    http://linuxwireless.org/en/users/Drivers/b43
- S:    Maintained
- 
- BEFS FILE SYSTEM
- P:    Sergey S. Kostyliov
- M:    rathamahata@php4.ru
- L:    linux-kernel@vger.kernel.org
- S:    Maintained
- 
- BFS FILE SYSTEM
- P:    Tigran A. Aivazian
- M:    tigran@aivazian.fsnet.co.uk
- L:    linux-kernel@vger.kernel.org
- S:    Maintained
- 
  BLACKFIN I2C TWI DRIVER
  P:    Sonic Zhang
  M:    sonic.zhang@analog.com
@@@ -1022,15 -1027,6 +1027,6 @@@ M:     corbet@lwn.ne
  L:    video4linux-list@redhat.com
  S:    Maintained
  
- CAN NETWORK LAYER
- P:    Urs Thuermann
- M:    urs.thuermann@volkswagen.de
- P:    Oliver Hartkopp
- M:    oliver.hartkopp@volkswagen.de
- L:    socketcan-core@lists.berlios.de (subscribers-only)
- W:    http://developer.berlios.de/projects/socketcan/
- S:    Maintained
- 
  CALGARY x86-64 IOMMU
  P:    Muli Ben-Yehuda
  M:    muli@il.ibm.com
@@@ -1040,6 -1036,15 +1036,15 @@@ L:    linux-kernel@vger.kernel.or
  L:    discuss@x86-64.org
  S:    Maintained
  
+ CAN NETWORK LAYER
+ P:    Urs Thuermann
+ M:    urs.thuermann@volkswagen.de
+ P:    Oliver Hartkopp
+ M:    oliver.hartkopp@volkswagen.de
+ L:    socketcan-core@lists.berlios.de (subscribers-only)
+ W:    http://developer.berlios.de/projects/socketcan/
+ S:    Maintained
+ 
  CELL BROADBAND ENGINE ARCHITECTURE
  P:    Arnd Bergmann
  M:    arnd@arndb.de
@@@ -1048,12 -1053,6 +1053,12 @@@ L:    cbe-oss-dev@ozlabs.or
  W:    http://www.ibm.com/developerworks/power/cell/
  S:    Supported
  
 +CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +
  CFAG12864B LCD DRIVER
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
@@@ -1085,19 -1084,11 +1090,11 @@@ P:   Joel Schop
  M:    jschopp@austin.ibm.com
  S:    Supported
  
- COMMON INTERNET FILE SYSTEM (CIFS)
- P:    Steve French
- M:    sfrench@samba.org
- L:    linux-cifs-client@lists.samba.org
- L:    samba-technical@lists.samba.org
- W:    http://linux-cifs.samba.org/
- T:    git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
- S:    Supported
- 
- CONFIGFS
- P:    Joel Becker
- M:    joel.becker@oracle.com
- L:    linux-kernel@vger.kernel.org
+ CISCO 10G ETHERNET DRIVER
+ P:    Scott Feldman
+ M:    scofeldm@cisco.com
+ P:    Joe Eykholt
+ M:    jeykholt@cisco.com
  S:    Supported
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
@@@ -1133,6 -1124,15 +1130,15 @@@ L:    codalist@coda.cs.cmu.ed
  W:    http://www.coda.cs.cmu.edu/
  S:    Maintained
  
+ COMMON INTERNET FILE SYSTEM (CIFS)
+ P:    Steve French
+ M:    sfrench@samba.org
+ L:    linux-cifs-client@lists.samba.org
+ L:    samba-technical@lists.samba.org
+ W:    http://linux-cifs.samba.org/
+ T:    git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
+ S:    Supported
+ 
  COMPACTPCI HOTPLUG CORE
  P:    Scott Murray
  M:    scottm@somanetworks.com
@@@ -1172,6 -1172,12 +1178,12 @@@ L:    accessrunner-general@lists.sourcefor
  W:    http://accessrunner.sourceforge.net/
  S:    Maintained
  
+ CONFIGFS
+ P:    Joel Becker
+ M:    joel.becker@oracle.com
+ L:    linux-kernel@vger.kernel.org
+ S:    Supported
+ 
  CONTROL GROUPS (CGROUPS)
  P:    Paul Menage
  M:    menage@google.com
@@@ -1295,6 -1301,20 +1307,20 @@@ W:    http://www.qsl.net/dl1bke
  L:    linux-hams@vger.kernel.org
  S:    Maintained
  
+ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
+ P:    Tobias Ringstrom
+ M:    tori@unhappy.mine.nu
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ 
+ DC390/AM53C974 SCSI driver
+ P:    Kurt Garloff
+ M:    garloff@suse.de
+ W:    http://www.garloff.de/kurt/linux/dc390/
+ P:    Guennadi Liakhovetski
+ M:    g.liakhovetski@gmx.de
+ S:    Maintained
+ 
  DC395x SCSI driver
  P:    Oliver Neukum
  M:    oliver@neukum.name
@@@ -1307,14 -1327,6 +1333,6 @@@ L:     dc395x@twibble.or
  L:    http://lists.twibble.org/mailman/listinfo/dc395x/
  S:    Maintained
  
- DC390/AM53C974 SCSI driver
- P:    Kurt Garloff
- M:    garloff@suse.de
- W:    http://www.garloff.de/kurt/linux/dc390/
- P:    Guennadi Liakhovetski
- M:    g.liakhovetski@gmx.de
- S:    Maintained
- 
  DCCP PROTOCOL
  P:    Arnaldo Carvalho de Melo
  M:    acme@ghostprotocols.net
@@@ -1345,12 -1357,6 +1363,6 @@@ P:     Doug Warzech
  M:    Douglas_Warzecha@dell.com
  S:    Maintained
  
- DEVICE-MAPPER  (LVM)
- P:    Alasdair Kergon
- L:    dm-devel@redhat.com
- W:    http://sources.redhat.com/dm
- S:    Maintained
- 
  DEVICE NUMBER REGISTRY
  P:    Torben Mathiasen
  M:    device@lanana.org
@@@ -1358,6 -1364,12 +1370,12 @@@ W:    http://lanana.org/docs/device-list/i
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
+ DEVICE-MAPPER  (LVM)
+ P:    Alasdair Kergon
+ L:    dm-devel@redhat.com
+ W:    http://sources.redhat.com/dm
+ S:    Maintained
+ 
  DIGI INTL. EPCA DRIVER
  P:    Digi International, Inc
  M:    Eng.Linux@digi.com
@@@ -1365,7 -1377,7 +1383,7 @@@ L:      Eng.Linux@digi.co
  W:    http://www.digi.com
  S:    Orphan
  
- DIRECTORY NOTIFICATION
+ DIRECTORY NOTIFICATION (DNOTIFY)
  P:    Stephen Rothwell
  M:    sfr@canb.auug.org.au
  L:    linux-kernel@vger.kernel.org
@@@ -1379,13 -1391,13 +1397,13 @@@ W:   http://www.win.tue.nl/~aeb/linux/zip
  W:    http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
  S:    Maintained
  
- DISKQUOTA:
+ DISKQUOTA
  P:    Jan Kara
  M:    jack@suse.cz
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
- DISTRIBUTED LOCK MANAGER
+ DISTRIBUTED LOCK MANAGER (DLM)
  P:    Christine Caulfield
  M:    ccaulfie@redhat.com
  P:    David Teigland
@@@ -1395,12 -1407,6 +1413,6 @@@ W:     http://sources.redhat.com/cluster
  T:    git kernel.org:/pub/scm/linux/kernel/git/teigland/dlm.git
  S:    Supported
  
- DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
- P:    Tobias Ringstrom
- M:    tori@unhappy.mine.nu
- L:    netdev@vger.kernel.org
- S:    Maintained
- 
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  P:    Maciej Sosnowski
  M:    maciej.sosnowski@intel.com
@@@ -1440,6 -1446,13 +1452,13 @@@ M:    jrv@vanzandt.mv.co
  L:    blinux-list@redhat.com
  S:    Maintained
  
+ DPT_I2O SCSI RAID DRIVER
+ P:    Adaptec OEM Raid Solutions
+ M:    aacraid@adaptec.com
+ L:    linux-scsi@vger.kernel.org
+ W:    http://www.adaptec.com/
+ S:    Maintained
+ 
  DRIVER CORE, KOBJECTS, AND SYSFS
  P:    Greg Kroah-Hartman
  M:    gregkh@suse.de
@@@ -1588,7 -1601,7 +1607,7 @@@ EFS FILESYSTE
  W:    http://aeschi.ch.eu.org/efs/
  S:    Orphan
  
- EHCA (IBM GX bus InfiniBand adapter) DRIVER:
+ EHCA (IBM GX bus InfiniBand adapter) DRIVER
  P:    Hoang-Nam Nguyen
  M:    hnguyen@de.ibm.com
  P:    Christoph Raisch
@@@ -1616,6 -1629,11 +1635,11 @@@ P:    Christopher Hoove
  M:    ch@murgatroid.com, ch@hpl.hp.com
  S:    Maintained
  
+ EPSON S1D13XXX FRAMEBUFFER DRIVER
+ P:    Kristoffer Ericson
+ M:    kristoffer.ericson@gmail.com
+ S:    Maintained
+ 
  ETHEREXPRESS-16 NETWORK DRIVER
  P:    Philip Blundell
  M:    philb@gnu.org
@@@ -1645,9 -1663,10 +1669,10 @@@ L:    linux-ext4@vger.kernel.or
  S:    Maintained
  
  EXT4 FILE SYSTEM
- P:    Stephen Tweedie, Andrew Morton
- M:    sct@redhat.com, akpm@linux-foundation.org, adilger@sun.com
+ P:    Theodore Ts'o
+ M:    tytso@mit.edu, adilger@sun.com
  L:    linux-ext4@vger.kernel.org
+ W:    http://ext4.wiki.kernel.org
  S:    Maintained
  
  F71805F HARDWARE MONITORING DRIVER
@@@ -1667,28 -1686,64 +1692,64 @@@ P:   Akinobu Mit
  M:    akinobu.mita@gmail.com
  S:    Supported
  
- FRAMEBUFFER LAYER
- P:    Antonino Daplas
- M:    adaplas@gmail.com
- L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
- W:    http://linux-fbdev.sourceforge.net/
+ FILE LOCKING (flock() and fcntl()/lockf())
+ P:    Matthew Wilcox
+ M:    matthew@wil.cx
+ L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  
- FREESCALE DMA DRIVER
- P:    Li Yang
- M:    leoli@freescale.com
- P:    Zhang Wei
- M:    zw@zh-kernel.org
- L:    linuxppc-embedded@ozlabs.org
- L:    linux-kernel@vger.kernel.org
+ FILESYSTEMS (VFS and infrastructure)
+ P:    Alexander Viro
+ M:    viro@zeniv.linux.org.uk
+ L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  
- FREESCALE I2C CPM DRIVER
- P:    Jochen Friedrich
- M:    jochen@scram.de
- L:    linuxppc-dev@ozlabs.org
- L:    i2c@lm-sensors.org
- S:    Maintained
+ FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
+ P:    Kristian Hoegsberg, Stefan Richter
+ M:    krh@redhat.com, stefanr@s5r6.in-berlin.de
+ L:    linux1394-devel@lists.sourceforge.net
+ W:    http://www.linux1394.org/
+ T:    git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
+ S:    Maintained
+ 
+ FIRMWARE LOADER (request_firmware)
+ L:    linux-kernel@vger.kernel.org
+ S:    Orphan
+ 
+ FPU EMULATOR
+ P:    Bill Metzenthen
+ M:    billm@suburbia.net
+ W:    http://suburbia.net/~billm/floating-point/emulator/
+ S:    Maintained
+ 
+ FRAME RELAY DLCI/FRAD (Sangoma drivers too)
+ P:    Mike McLagan
+ M:    mike.mclagan@linux.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ 
+ FRAMEBUFFER LAYER
+ P:    Antonino Daplas
+ M:    adaplas@gmail.com
+ L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ W:    http://linux-fbdev.sourceforge.net/
+ S:    Maintained
+ 
+ FREESCALE DMA DRIVER
+ P:    Li Yang
+ M:    leoli@freescale.com
+ P:    Zhang Wei
+ M:    zw@zh-kernel.org
+ L:    linuxppc-embedded@ozlabs.org
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ 
+ FREESCALE I2C CPM DRIVER
+ P:    Jochen Friedrich
+ M:    jochen@scram.de
+ L:    linuxppc-dev@ozlabs.org
+ L:    i2c@lm-sensors.org
+ S:    Maintained
  
  FREESCALE SOC FS_ENET DRIVER
  P:    Pantelis Antoniou
@@@ -1732,42 -1787,6 +1793,6 @@@ L:     alsa-devel@alsa-project.or
  L:    linuxppc-dev@ozlabs.org
  S:    Supported
  
- FILE LOCKING (flock() and fcntl()/lockf())
- P:    Matthew Wilcox
- M:    matthew@wil.cx
- L:    linux-fsdevel@vger.kernel.org
- S:    Maintained
- 
- FILESYSTEMS (VFS and infrastructure)
- P:    Alexander Viro
- M:    viro@zeniv.linux.org.uk
- L:    linux-fsdevel@vger.kernel.org
- S:    Maintained
- 
- FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
- P:    Kristian Hoegsberg, Stefan Richter
- M:    krh@redhat.com, stefanr@s5r6.in-berlin.de
- L:    linux1394-devel@lists.sourceforge.net
- W:    http://www.linux1394.org/
- T:    git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
- S:    Maintained
- 
- FIRMWARE LOADER (request_firmware)
- L:    linux-kernel@vger.kernel.org
- S:    Orphan
- 
- FPU EMULATOR
- P:    Bill Metzenthen
- M:    billm@suburbia.net
- W:    http://suburbia.net/~billm/floating-point/emulator/
- S:    Maintained
- 
- FRAME RELAY DLCI/FRAD (Sangoma drivers too)
- P:    Mike McLagan
- M:    mike.mclagan@linux.org
- L:    netdev@vger.kernel.org
- S:    Maintained
- 
  FREEVXFS FILESYSTEM
  P:    Christoph Hellwig
  M:    hch@infradead.org
@@@ -1839,6 -1858,13 +1864,13 @@@ L:    gigaset307x-common@lists.sourceforge
  W:    http://gigaset307x.sourceforge.net/
  S:    Maintained
  
+ HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
+ P:    Robert Love
+ M:    rlove@rlove.org
+ M:    linux-kernel@vger.kernel.org
+ W:    http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
+ S:    Maintained
+ 
  HARDWARE MONITORING
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
@@@ -1847,13 -1873,6 +1879,6 @@@ S:     Orpha
  HARDWARE RANDOM NUMBER GENERATOR CORE
  S:    Orphan
  
- HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
- P:    Robert Love
- M:    rlove@rlove.org
- M:    linux-kernel@vger.kernel.org
- W:    http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
- S:    Maintained
- 
  HARMONY SOUND DRIVER
  P:    Kyle McMartin
  M:    kyle@mcmartin.ca
@@@ -1867,6 -1886,24 +1892,24 @@@ L:    linux-kernel@vger.kernel.or
  W:    http://www.nyx.net/~arobinso
  S:    Maintained
  
+ HEWLETT-PACKARD FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA
+ P:    Chirag Kantharia
+ M:    chirag.kantharia@hp.com
+ L:    iss_storagedev@hp.com
+ S:    Maintained
+ 
+ HEWLETT-PACKARD SMART2 RAID DRIVER
+ P:    Chirag Kantharia
+ M:    chirag.kantharia@hp.com
+ L:    iss_storagedev@hp.com
+ S:    Maintained
+ 
+ HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
+ P:    Mike Miller
+ M:    mike.miller@hp.com
+ L:    iss_storagedev@hp.com
+ S:    Supported
+ 
  HFS FILESYSTEM
  P:    Roman Zippel
  M:    zippel@linux-m68k.org
@@@ -1880,6 -1917,14 +1923,14 @@@ L:    linux-nvidia@lists.surfsouth.co
  W:    http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
  S:    Maintained
  
+ HIBERNATION (aka Software Suspend, aka swsusp)
+ P:    Pavel Machek
+ M:    pavel@suse.cz
+ P:    Rafael J. Wysocki
+ M:    rjw@sisk.pl
+ L:    linux-pm@lists.linux-foundation.org
+ S:    Supported
+ 
  HID CORE LAYER
  P:    Jiri Kosina
  M:    jkosina@suse.cz
@@@ -1912,24 -1957,6 +1963,6 @@@ M:     jes@trained-monkey.or
  L:    linux-hippi@sunsite.dk
  S:    Maintained
  
- HEWLETT-PACKARD FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA
- P:    Chirag Kantharia
- M:    chirag.kantharia@hp.com
- L:    iss_storagedev@hp.com
- S:    Maintained
- 
- HEWLETT-PACKARD SMART2 RAID DRIVER
- P:    Chirag Kantharia
- M:    chirag.kantharia@hp.com
- L:    iss_storagedev@hp.com
- S:    Maintained
- 
- HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
- P:    Mike Miller
- M:    mike.miller@hp.com
- L:    iss_storagedev@hp.com
- S:    Supported
- 
  HOST AP DRIVER
  P:    Jouni Malinen
  M:    j@w1.fi
@@@ -1938,16 -1965,16 +1971,16 @@@ L:   linux-wireless@vger.kernel.or
  W:    http://hostap.epitest.fi/
  S:    Maintained
  
- HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
- P:    Jaroslav Kysela
- M:    perex@perex.cz
- S:    Maintained
- 
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
  P:    Carlos Corbacho
  M:    carlos@strangeworlds.co.uk
  S:    Odd Fixes
  
+ HP100:        Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
+ P:    Jaroslav Kysela
+ M:    perex@perex.cz
+ S:    Maintained
+ 
  HPET: High Precision Event Timers driver (drivers/char/hpet.c)
  P:    Clemens Ladisch
  M:    clemens@ladisch.de
@@@ -2027,14 -2054,6 +2060,6 @@@ W:     http://www.ia64-linux.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
  S:    Maintained
  
- SN-IA64 (Itanium) SUB-PLATFORM
- P:    Jes Sorensen
- M:    jes@sgi.com
- L:    linux-altix@sgi.com
- L:    linux-ia64@vger.kernel.org
- W:    http://www.sgi.com/altix
- S:    Maintained
- 
  IBM MCA SCSI SUBSYSTEM DRIVER
  P:    Michael Lang
  M:    langa2@kph.uni-mainz.de
@@@ -2118,14 -2137,6 +2143,6 @@@ W:     http://www.openib.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
  
- INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
- P:    Dmitry Torokhov
- M:    dmitry.torokhov@gmail.com
- M:    dtor@mail.ru
- L:    linux-input@vger.kernel.org
- T:    git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
- S:    Maintained
- 
  INOTIFY
  P:    John McCutchan
  M:    ttb@tentacle.dhs.org
@@@ -2134,6 -2145,14 +2151,14 @@@ M:    rml@novell.co
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
+ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
+ P:    Dmitry Torokhov
+ M:    dmitry.torokhov@gmail.com
+ M:    dtor@mail.ru
+ L:    linux-input@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
+ S:    Maintained
+ 
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
  P:    Sylvain Meyer
  M:    sylvain.meyer@worldonline.fr
@@@ -2238,7 -2257,7 +2263,7 @@@ M:      pfg@sgi.co
  L:    linux-mips@linux-mips.org
  S:    Maintained
  
- IP MASQUERADING:
+ IP MASQUERADING
  P:    Juanjo Ciarlante
  M:    jjciarla@raiz.uncu.edu.ar
  S:    Maintained
@@@ -2253,7 -2272,7 +2278,7 @@@ M:      jesse@icplus.com.t
  L:    netdev@vger.kernel.org
  S:    Maintained
  
- IPATH DRIVER:
+ IPATH DRIVER
  P:    Ralph Campbell
  M:    infinipath@qlogic.com
  L:    general@lists.openfabrics.org
@@@ -2267,13 -2286,25 +2292,25 @@@ L:   openipmi-developer@lists.sourceforge
  W:    http://openipmi.sourceforge.net/
  S:    Supported
  
- IPX NETWORK LAYER
- P:    Arnaldo Carvalho de Melo
- M:    acme@ghostprotocols.net
+ IPS SCSI RAID DRIVER
+ P:    Adaptec OEM Raid Solutions
+ M:    aacraid@adaptec.com
+ L:    linux-scsi@vger.kernel.org
+ W:    http://www.adaptec.com/
+ S:    Maintained
+ 
+ IPVS
+ P:    Wensong Zhang
+ M:    wensong@linux-vs.org
+ P:    Simon Horman
+ M:    horms@verge.net.au
+ P:    Julian Anastasov
+ M:    ja@ssi.bg
  L:    netdev@vger.kernel.org
+ L:    lvs-devel@vger.kernel.org
  S:    Maintained
  
- IPWIRELES DRIVER
+ IPWIRELESS DRIVER
  P:    Jiri Kosina
  M:    jkosina@suse.cz
  P:    David Sterba
@@@ -2281,6 -2312,12 +2318,12 @@@ M:    dsterba@suse.c
  S:    Maintained
  T:    git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
  
+ IPX NETWORK LAYER
+ P:    Arnaldo Carvalho de Melo
+ M:    acme@ghostprotocols.net
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ 
  IRDA SUBSYSTEM
  P:    Samuel Ortiz
  M:    samuel@sortiz.org
@@@ -2288,6 -2325,11 +2331,11 @@@ L:    irda-users@lists.sourceforge.net (su
  W:    http://irda.sourceforge.net/
  S:    Maintained
  
+ ISAPNP
+ P:    Jaroslav Kysela
+ M:    perex@perex.cz
+ S:    Maintained
+ 
  ISCSI
  P:    Mike Christie
  M:    michaelc@cs.wisc.edu
@@@ -2296,11 -2338,6 +2344,6 @@@ W:     www.open-iscsi.or
  T:    git kernel.org:/pub/scm/linux/kernel/mnc/linux-2.6-iscsi.git
  S:    Maintained
  
- ISAPNP
- P:    Jaroslav Kysela
- M:    perex@perex.cz
- S:    Maintained
- 
  ISDN SUBSYSTEM
  P:    Karsten Keil
  M:    kkeil@suse.de
@@@ -2325,23 -2362,6 +2368,6 @@@ L:     video4linux-list@redhat.co
  W:    http://www.ivtvdriver.org
  S:    Maintained
  
- JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
- P:    David Woodhouse
- M:    dwmw2@infradead.org
- L:    linux-mtd@lists.infradead.org
- W:    http://www.linux-mtd.infradead.org/doc/jffs2.html
- S:    Maintained
- 
- UBI FILE SYSTEM (UBIFS)
- P:    Artem Bityutskiy
- M:    dedekind@infradead.org
- P:    Adrian Hunter
- M:    ext-adrian.hunter@nokia.com
- L:    linux-mtd@lists.infradead.org
- T:    git git://git.infradead.org/~dedekind/ubifs-2.6.git
- W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
- S:    Maintained
- 
  JFS FILESYSTEM
  P:    Dave Kleikamp
  M:    shaggy@austin.ibm.com
@@@ -2350,6 -2370,19 +2376,19 @@@ W:    http://jfs.sourceforge.net
  T:    git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
  S:    Supported
  
+ JME NETWORK DRIVER
+ P:    Guo-Fu Tseng
+ M:    cooldavid@cooldavid.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ 
+ JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
+ P:    David Woodhouse
+ M:    dwmw2@infradead.org
+ L:    linux-mtd@lists.infradead.org
+ W:    http://www.linux-mtd.infradead.org/doc/jffs2.html
+ S:    Maintained
+ 
  JOURNALLING LAYER FOR BLOCK DEVICES (JBD)
  P:    Stephen Tweedie, Andrew Morton
  M:    sct@redhat.com, akpm@linux-foundation.org
@@@ -2415,7 -2448,14 +2454,14 @@@ S:    Supporte
  
  KERNEL VIRTUAL MACHINE (KVM)
  P:    Avi Kivity
- M:    avi@qumranet.com
+ M:    avi@redhat.com
+ L:    kvm@vger.kernel.org
+ W:    http://kvm.qumranet.com
+ S:    Supported
+ 
+ KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
+ P:    Joerg Roedel
+ M:    joerg.roedel@amd.com
  L:    kvm@vger.kernel.org
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -2586,11 -2626,6 +2632,6 @@@ W:     http://www.pasemi.com
  L:    linuxppc-dev@ozlabs.org
  S:    Supported
  
- LLC (802.2)
- P:    Arnaldo Carvalho de Melo
- M:    acme@ghostprotocols.net
- S:    Maintained
- 
  LINUX SECURITY MODULE (LSM) FRAMEWORK
  P:    Chris Wright
  M:    chrisw@sous-sol.org
@@@ -2598,6 -2633,11 +2639,11 @@@ L:    linux-security-module@vger.kernel.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
  S:    Supported
  
+ LLC (802.2)
+ P:    Arnaldo Carvalho de Melo
+ M:    acme@ghostprotocols.net
+ S:    Maintained
+ 
  LM83 HARDWARE MONITOR DRIVER
  P:    Jean Delvare
  M:    khali@linux-fr.org
@@@ -2698,14 -2738,6 +2744,6 @@@ M:     kaber@trash.ne
  L:    netdev@vger.kernel.org
  S:    Maintained
  
- MARVELL YUKON / SYSKONNECT DRIVER
- P:    Mirko Lindner
- M:    mlindner@syskonnect.de
- P:    Ralph Roesler
- M:    rroesler@syskonnect.de
- W:    http://www.syskonnect.com
- S:    Supported
- 
  MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
  P:    Michael Kerrisk
  M:    mtk.manpages@gmail.com
@@@ -2725,6 -2757,14 +2763,14 @@@ M:    buytenh@marvell.co
  L:    netdev@vger.kernel.org
  S:    Supported
  
+ MARVELL YUKON / SYSKONNECT DRIVER
+ P:    Mirko Lindner
+ M:    mlindner@syskonnect.de
+ P:    Ralph Roesler
+ M:    rroesler@syskonnect.de
+ W:    http://www.syskonnect.com
+ S:    Supported
+ 
  MATROX FRAMEBUFFER DRIVER
  P:    Petr Vandrovec
  M:    vandrove@vc.cvut.cz
@@@ -2761,15 -2801,6 +2807,6 @@@ L:     linux-mm@kvack.or
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
- MEI MN10300/AM33 PORT
- P:    David Howells
- M:    dhowells@redhat.com
- P:    Koichi Yasutake
- M:    yasutake.koichi@jp.panasonic.com
- L:    linux-am33-list@redhat.com (moderated for non-subscribers)
- W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
- S:    Maintained
- 
  MEMORY TECHNOLOGY DEVICES (MTD)
  P:    David Woodhouse
  M:    dwmw2@infradead.org
@@@ -2778,14 -2809,6 +2815,6 @@@ L:     linux-mtd@lists.infradead.or
  T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  
- UNSORTED BLOCK IMAGES (UBI)
- P:    Artem Bityutskiy
- M:    dedekind@infradead.org
- W:    http://www.linux-mtd.infradead.org/
- L:    linux-mtd@lists.infradead.org
- T:    git git://git.infradead.org/~dedekind/ubi-2.6.git
- S:    Maintained
- 
  MICROTEK X6 SCANNER
  P:    Oliver Neukum
  M:    oliver@neukum.name
@@@ -3017,17 -3040,6 +3046,6 @@@ L:     netdev@vger.kernel.or
  W:    http://www.netxen.com
  S:    Supported
  
- IPVS
- P:    Wensong Zhang
- M:    wensong@linux-vs.org
- P:    Simon Horman
- M:    horms@verge.net.au
- P:    Julian Anastasov
- M:    ja@ssi.bg
- L:    netdev@vger.kernel.org
- L:    lvs-devel@vger.kernel.org
- S:    Maintained
- 
  NFS, SUNRPC, AND LOCKD CLIENTS
  P:    Trond Myklebust
  M:    Trond.Myklebust@netapp.com
@@@ -3073,22 -3085,6 +3091,6 @@@ M:     adaplas@gmail.co
  L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  
- OPENCORES I2C BUS DRIVER
- P:    Peter Korsgaard
- M:    jacmet@sunsite.dk
- L:    i2c@lm-sensors.org
- S:    Maintained
- 
- ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
- P:    Mark Fasheh
- M:    mfasheh@suse.com
- P:    Joel Becker
- M:    joel.becker@oracle.com
- L:    ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
- W:    http://oss.oracle.com/projects/ocfs2/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
- S:    Supported
- 
  OMFS FILESYSTEM
  P:    Bob Copeland
  M:    me@bobcopeland.com
@@@ -3124,12 -3120,28 +3126,28 @@@ L:   osst-users@lists.sourceforge.ne
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
+ OPENCORES I2C BUS DRIVER
+ P:    Peter Korsgaard
+ M:    jacmet@sunsite.dk
+ L:    i2c@lm-sensors.org
+ S:    Maintained
+ 
  OPROFILE
  P:    Robert Richter
  M:    robert.richter@amd.com
  L:    oprofile-list@lists.sf.net
  S:    Maintained
  
+ ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
+ P:    Mark Fasheh
+ M:    mfasheh@suse.com
+ P:    Joel Becker
+ M:    joel.becker@oracle.com
+ L:    ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
+ W:    http://oss.oracle.com/projects/ocfs2/
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
+ S:    Supported
+ 
  ORINOCO DRIVER
  P:    Pavel Roskin
  M:    proski@gnu.org
@@@ -3141,6 -3153,14 +3159,14 @@@ L:    orinoco-devel@lists.sourceforge.ne
  W:    http://www.nongnu.org/orinoco/
  S:    Maintained
  
+ P54 WIRELESS DRIVER
+ P:    Michael Wu
+ M:    flamingice@sourmilk.net
+ L:    linux-wireless@vger.kernel.org
+ W:    http://prism54.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+ S:    Maintained
+ 
  PA SEMI ETHERNET DRIVER
  P:    Olof Johansson
  M:    olof@lixom.net
@@@ -3153,10 -3173,32 +3179,32 @@@ M:   olof@lixom.ne
  L:    i2c@lm-sensors.org
  S:    Maintained
  
+ PANASONIC MN10300/AM33 PORT
+ P:    David Howells
+ M:    dhowells@redhat.com
+ P:    Koichi Yasutake
+ M:    yasutake.koichi@jp.panasonic.com
+ L:    linux-am33-list@redhat.com (moderated for non-subscribers)
+ W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
+ S:    Maintained
+ 
  PARALLEL PORT SUPPORT
  L:    linux-parport@lists.infradead.org (subscribers-only)
  S:    Orphan
  
+ PARAVIRT_OPS INTERFACE
+ P:    Jeremy Fitzhardinge
+ M:    jeremy@xensource.com
+ P:    Chris Wright
+ M:    chrisw@sous-sol.org
+ P:    Zachary Amsden
+ M:    zach@vmware.com
+ P:    Rusty Russell
+ M:    rusty@rustcorp.com.au
+ L:    virtualization@lists.osdl.org
+ L:    linux-kernel@vger.kernel.org
+ S:    Supported
+ 
  PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
  P:    Tim Waugh
  M:    tim@cyberelk.net
@@@ -3176,19 -3218,6 +3224,6 @@@ W:     http://www.parisc-linux.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
  S:    Maintained
  
- PARAVIRT_OPS INTERFACE
- P:    Jeremy Fitzhardinge
- M:    jeremy@xensource.com
- P:    Chris Wright
- M:    chrisw@sous-sol.org
- P:    Zachary Amsden
- M:    zach@vmware.com
- P:    Rusty Russell
- M:    rusty@rustcorp.com.au
- L:    virtualization@lists.osdl.org
- L:    linux-kernel@vger.kernel.org
- S:    Supported
- 
  PC87360 HARDWARE MONITORING DRIVER
  P:    Jim Cromie
  M:    jim.cromie@gmail.com
@@@ -3318,14 -3347,6 +3353,6 @@@ L:     kpreempt-tech@lists.sourceforge.ne
  W:    ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
  S:    Supported
  
- P54 WIRELESS DRIVER
- P:    Michael Wu
- M:    flamingice@sourmilk.net
- L:    linux-wireless@vger.kernel.org
- W:    http://prism54.org
- T:    git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
- S:    Maintained
- 
  PRISM54 WIRELESS DRIVER
  P:    Luis R. Rodriguez
  M:    mcgrof@gmail.com
@@@ -3381,12 -3402,19 +3408,19 @@@ S:   Orpha
  QLOGIC QLA2XXX FC-SCSI DRIVER
  P:    Andrew Vasquez
  M:    linux-driver@qlogic.com
- L:    linux-scsi@vger.kernel.org
+ L:    linux-scsi@vger.kernel.org
+ S:    Supported
+ 
+ QLOGIC QLA3XXX NETWORK DRIVER
+ P:    Ron Mercer
+ M:    linux-driver@qlogic.com
+ L:    netdev@vger.kernel.org
  S:    Supported
  
- QLOGIC QLA3XXX NETWORK DRIVER
+ QLOGIC QLGE 10Gb ETHERNET DRIVER
  P:    Ron Mercer
  M:    linux-driver@qlogic.com
+ M:    ron.mercer@qlogic.com
  L:    netdev@vger.kernel.org
  S:    Supported
  
@@@ -3409,13 -3437,7 +3443,7 @@@ M:     paulus@samba.or
  L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  
- RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
- P:    Corey Thomas
- M:    coreythomas@charter.net
- L:    linux-wireless@vger.kernel.org
- S:    Maintained
- 
- RALINK RT2X00 WLAN DRIVER
+ RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  L:    linux-wireless@vger.kernel.org
  L:    rt2400-devel@lists.sourceforge.net
@@@ -3440,6 -3462,18 +3468,18 @@@ M:    mporter@kernel.crashing.or
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
+ RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
+ P:    Corey Thomas
+ M:    coreythomas@charter.net
+ L:    linux-wireless@vger.kernel.org
+ S:    Maintained
+ 
+ RCUTORTURE MODULE
+ P:    Josh Triplett
+ M:    josh@freedesktop.org
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ 
  RDC R-321X SoC
  P:    Florian Fainelli
  M:    florian.fainelli@telecomint.eu
@@@ -3459,12 -3493,6 +3499,6 @@@ W:     http://www.rdrop.com/users/paulmck/r
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  
- RCUTORTURE MODULE
- P:    Josh Triplett
- M:    josh@freedesktop.org
- L:    linux-kernel@vger.kernel.org
- S:    Maintained
- 
  REAL TIME CLOCK DRIVER
  P:    Paul Gortmaker
  M:    p_gortmaker@yahoo.com
@@@ -3488,6 -3516,9 +3522,9 @@@ L:      netdev@vger.kernel.or
  S:    Maintained
  F:    net/rfkill
  
+ RISCOM8 DRIVER
+ S:    Orphan
+ 
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
@@@ -3500,9 -3531,6 +3537,6 @@@ L:      linux-hams@vger.kernel.or
  W:    http://www.linux-ax25.org/
  S:    Maintained
  
- RISCOM8 DRIVER
- S:    Orphan
- 
  RTL818X WIRELESS DRIVER
  P:    Michael Wu
  M:    flamingice@sourmilk.net
@@@ -3642,6 -3670,12 +3676,12 @@@ M:    saschasommer@freenet.d
  L:    sdricohcs-devel@lists.sourceforge.net (subscribers-only)
  S:    Maintained
  
+ SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
+ P:    Pierre Ossman
+ M:    drzeus-sdhci@drzeus.cx
+ L:    sdhci-devel@list.drzeus.cx
+ S:    Maintained
+ 
  SECURITY CONTACT
  P:    Security Officers
  M:    security@kernel.org
@@@ -3655,8 -3689,9 +3695,9 @@@ M:      jmorris@namei.or
  P:    Eric Paris
  M:    eparis@parisplace.org
  L:    linux-kernel@vger.kernel.org (kernel issues)
- L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
- W:    http://www.nsa.gov/selinux
+ L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
+ W:    http://selinuxproject.org
+ T:    git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
  S:    Supported
  
  SENSABLE PHANTOM
@@@ -3664,19 -3699,13 +3705,13 @@@ P:   Jiri Slab
  M:    jirislaby@gmail.com
  S:    Maintained
  
- SERIAL ATA (SATA) SUBSYSTEM:
+ SERIAL ATA (SATA) SUBSYSTEM
  P:    Jeff Garzik
  M:    jgarzik@pobox.com
  L:    linux-ide@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
  S:    Supported
  
- SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
- P:    Pat Gefre
- M:    pfg@sgi.com
- L:    linux-ia64@vger.kernel.org
- S:    Supported
- 
  SFC NETWORK DRIVER
  P:    Steve Hodgson
  P:    Ben Hutchings
@@@ -3684,6 -3713,17 +3719,17 @@@ P:    Robert Stonehous
  M:    linux-net-drivers@solarflare.com
  S:    Supported
  
+ SGI GRU DRIVER
+ P:    Jack Steiner
+ M:    steiner@sgi.com
+ S:    Maintained
+ 
+ SGI SN-IA64 (Altix) SERIAL CONSOLE DRIVER
+ P:    Pat Gefre
+ M:    pfg@sgi.com
+ L:    linux-ia64@vger.kernel.org
+ S:    Supported
+ 
  SGI VISUAL WORKSTATION 320 AND 540
  P:    Andrey Panin
  M:    pazke@donpac.ru
@@@ -3691,16 -3731,24 +3737,24 @@@ L:   linux-visws-devel@lists.sf.ne
  W:    http://linux-visws.sf.net
  S:    Maintained for 2.6.
  
- SGI GRU DRIVER
- P:    Jack Steiner
- M:    steiner@sgi.com
- S:    Maintained
- 
  SGI XP/XPC/XPNET DRIVER
  P:    Dean Nelson
  M:    dcn@sgi.com
  S:    Maintained
  
+ SHARP LH SUPPORT (LH7952X & LH7A40X)
+ P:    Marc Singer
+ M:    elf@buici.com
+ W:    http://projects.buici.com/arm
+ L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+ S:    Maintained
+ 
+ SHPC HOTPLUG DRIVER
+ P:    Kristen Carlson Accardi
+ M:    kristen.c.accardi@intel.com
+ L:    linux-pci@vger.kernel.org
+ S:    Supported
+ 
  SIMTEC EB110ATX (Chalice CATS)
  P:    Ben Dooks
  P:    Vincent Sanders
@@@ -3746,6 -3794,12 +3800,12 @@@ M:    thomas@winischhofer.ne
  W:    http://www.winischhofer.at/linuxsisusbvga.shtml
  S:    Maintained
  
+ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
+ P:    Stephen Hemminger
+ M:    shemminger@linux-foundation.org
+ L:    netdev@vger.kernel.org
+ S:    Maintained
+ 
  SLAB ALLOCATOR
  P:    Christoph Lameter
  M:    cl@linux-foundation.org
@@@ -3772,12 -3826,25 +3832,25 @@@ P:   Ben Nizett
  M:    bn@niasdigital.com
  S:    Maintained
  
+ SN-IA64 (Itanium) SUB-PLATFORM
+ P:    Jes Sorensen
+ M:    jes@sgi.com
+ L:    linux-altix@sgi.com
+ L:    linux-ia64@vger.kernel.org
+ W:    http://www.sgi.com/altix
+ S:    Maintained
+ 
  SOC-CAMERA V4L2 SUBSYSTEM
  P:    Guennadi Liakhovetski
  M:    g.liakhovetski@gmx.de
  L:    video4linux-list@redhat.com
  S:    Maintained
  
+ SOEKRIS NET48XX LED SUPPORT
+ P:    Chris Boot
+ M:    bootc@bootc.net
+ S:    Maintained
+ 
  SOFTWARE RAID (Multiple Disks) SUPPORT
  P:    Ingo Molnar
  M:    mingo@redhat.com
@@@ -3786,24 -3853,6 +3859,6 @@@ M:     neilb@suse.d
  L:    linux-raid@vger.kernel.org
  S:    Supported
  
- HIBERNATION (aka Software Suspend, aka swsusp):
- P:    Pavel Machek
- M:    pavel@suse.cz
- P:    Rafael J. Wysocki
- M:    rjw@sisk.pl
- L:    linux-pm@lists.linux-foundation.org
- S:    Supported
- 
- SUSPEND TO RAM:
- P:    Len Brown
- M:    len.brown@intel.com
- P:    Pavel Machek
- M:    pavel@suse.cz
- P:    Rafael J. Wysocki
- M:    rjw@sisk.pl
- L:    linux-pm@lists.linux-foundation.org
- S:    Supported
- 
  SONIC NETWORK DRIVER
  P:    Thomas Bogendoerfer
  M:    tsbogend@alpha.franken.de
@@@ -3833,6 -3882,8 +3888,8 @@@ S:      Maintaine
  SOUND
  P:    Jaroslav Kysela
  M:    perex@perex.cz
+ P:    Takashi Iwai
+ M:    tiwai@suse.de
  L:    alsa-devel@alsa-project.org (subscribers-only)
  S:    Maintained
  
@@@ -3846,59 -3897,7 +3903,7 @@@ L:     alsa-devel@alsa-project.org (subscri
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  
- SPI SUBSYSTEM
- P:    David Brownell
- M:    dbrownell@users.sourceforge.net
- L:    spi-devel-general@lists.sourceforge.net
- S:    Maintained
- 
- SPU FILE SYSTEM
- P:    Jeremy Kerr
- M:    jk@ozlabs.org
- L:    linuxppc-dev@ozlabs.org
- L:    cbe-oss-dev@ozlabs.org
- W:    http://www.ibm.com/developerworks/power/cell/
- S:    Supported
- 
- STABLE BRANCH:
- P:    Greg Kroah-Hartman
- M:    greg@kroah.com
- P:    Chris Wright
- M:    chrisw@sous-sol.org
- L:    stable@kernel.org
- S:    Maintained
- 
- SHARP LH SUPPORT (LH7952X & LH7A40X)
- P:    Marc Singer
- M:    elf@buici.com
- W:    http://projects.buici.com/arm
- L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
- S:    Maintained
- 
- SHPC HOTPLUG DRIVER
- P:    Kristen Carlson Accardi
- M:    kristen.c.accardi@intel.com
- L:    linux-pci@vger.kernel.org
- S:    Supported
- 
- SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER
- P:    Pierre Ossman
- M:    drzeus-sdhci@drzeus.cx
- L:    sdhci-devel@list.drzeus.cx
- S:    Maintained
- 
- SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
- P:    Stephen Hemminger
- M:    shemminger@linux-foundation.org
- L:    netdev@vger.kernel.org
- S:    Maintained
- 
- SOEKRIS NET48XX LED SUPPORT
- P:    Chris Boot
- M:    bootc@bootc.net
- S:    Maintained
- 
- SPARC (sparc32):
+ SPARC (sparc32)
  P:    William L. Irwin
  M:    wli@holomorphy.com
  L:    sparclinux@vger.kernel.org
@@@ -3910,6 -3909,12 +3915,12 @@@ M:    R.E.Wolff@BitWizard.n
  L:    linux-kernel@vger.kernel.org ?
  S:    Supported
  
+ SPI SUBSYSTEM
+ P:    David Brownell
+ M:    dbrownell@users.sourceforge.net
+ L:    spi-devel-general@lists.sourceforge.net
+ S:    Maintained
+ 
  SPIDERNET NETWORK DRIVER for CELL
  P:    Ishizaki Kou
  M:    kou.ishizaki@toshiba.co.jp
@@@ -3918,12 -3923,35 +3929,35 @@@ M:   jens@de.ibm.co
  L:    netdev@vger.kernel.org
  S:    Supported
  
+ SPU FILE SYSTEM
+ P:    Jeremy Kerr
+ M:    jk@ozlabs.org
+ L:    linuxppc-dev@ozlabs.org
+ L:    cbe-oss-dev@ozlabs.org
+ W:    http://www.ibm.com/developerworks/power/cell/
+ S:    Supported
+ 
  SRM (Alpha) environment access
  P:    Jan-Benedict Glaw
  M:    jbglaw@lug-owl.de
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
+ STABLE BRANCH
+ P:    Greg Kroah-Hartman
+ M:    greg@kroah.com
+ P:    Chris Wright
+ M:    chrisw@sous-sol.org
+ L:    stable@kernel.org
+ S:    Maintained
+ 
+ STAGING SUBSYSTEM
+ P:    Greg Kroah-Hartman
+ M:    gregkh@suse.de
+ L:    linux-kernel@vger.kernel.org
+ T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
+ S:    Maintained
+ 
  STARFIRE/DURALAN NETWORK DRIVER
  P:    Ion Badulescu
  M:    ionut@cs.columbia.edu
@@@ -3939,6 -3967,12 +3973,12 @@@ M:    laredo@gnu.or
  W:    http://www.stradis.com/
  S:    Maintained
  
+ SUN3/3X
+ P:    Sam Creasey
+ M:    sammy@sammy.net
+ W:    http://sammy.net/sun3/
+ S:    Maintained
+ 
  SUPERH
  P:    Paul Mundt
  M:    lethal@linux-sh.org
@@@ -3947,11 -3981,15 +3987,15 @@@ W:   http://www.linux-sh.or
  T:    git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Supported
  
- SUN3/3X
- P:    Sam Creasey
- M:    sammy@sammy.net
- W:    http://sammy.net/sun3/
- S:    Maintained
+ SUSPEND TO RAM
+ P:    Len Brown
+ M:    len.brown@intel.com
+ P:    Pavel Machek
+ M:    pavel@suse.cz
+ P:    Rafael J. Wysocki
+ M:    rjw@sisk.pl
+ L:    linux-pm@lists.linux-foundation.org
+ S:    Supported
  
  SVGA HANDLING
  P:    Martin Mares
@@@ -3997,7 -4035,7 +4041,7 @@@ P:      Mark Gros
  M:    mark.gross@intel.com
  S:    Supported
  
- TENSILICA XTENSA PORT (xtensa):
+ TENSILICA XTENSA PORT (xtensa)
  P:    Chris Zankel
  M:    chris@zankel.net
  S:    Maintained
@@@ -4070,7 -4108,7 +4114,7 @@@ W:      http://tpmdd.sourceforge.ne
  P:    Marcel Selhorst
  M:    tpm@selhorst.net
  W:    http://www.prosec.rub.de/tpm/
- L:    tpmdd-devel@lists.sourceforge.net
+ L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  
  TRIVIAL PATCHES
@@@ -4111,6 -4149,16 +4155,16 @@@ M:    ballabio_dario@emc.co
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
+ UBI FILE SYSTEM (UBIFS)
+ P:    Artem Bityutskiy
+ M:    dedekind@infradead.org
+ P:    Adrian Hunter
+ M:    ext-adrian.hunter@nokia.com
+ L:    linux-mtd@lists.infradead.org
+ T:    git git://git.infradead.org/~dedekind/ubifs-2.6.git
+ W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
+ S:    Maintained
+ 
  UCLINUX (AND M68KNOMMU)
  P:    Greg Ungerer
  M:    gerg@uclinux.org
@@@ -4136,19 -4184,13 +4190,19 @@@ M:   dushistov@mail.r
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
- UltraSPARC (sparc64):
+ UltraSPARC (sparc64)
  P:    David S. Miller
  M:    davem@davemloft.net
  L:    sparclinux@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  S:    Maintained
  
 +ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +
  UNIFORM CDROM DRIVER
  P:    Jens Axboe
  M:    axboe@kernel.dk
@@@ -4156,6 -4198,14 +4210,14 @@@ L:    linux-kernel@vger.kernel.or
  W:    http://www.kernel.dk
  S:    Maintained
  
+ UNSORTED BLOCK IMAGES (UBI)
+ P:    Artem Bityutskiy
+ M:    dedekind@infradead.org
+ W:    http://www.linux-mtd.infradead.org/
+ L:    linux-mtd@lists.infradead.org
+ T:    git git://git.infradead.org/~dedekind/ubi-2.6.git
+ S:    Maintained
+ 
  USB ACM DRIVER
  P:    Oliver Neukum
  M:    oliver@neukum.name
@@@ -4345,6 -4395,12 +4407,12 @@@ L:    linux-usb@vger.kernel.or
  W:    http://www.connecttech.com
  S:    Supported
  
+ USB SMSC95XX ETHERNET DRIVER
+ P:    Steve Glendinning
+ M:    steve.glendinning@smsc.com
+ L:    netdev@vger.kernel.org
+ S:    Supported
+ 
  USB SN9C1xx DRIVER
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
@@@ -4419,7 -4475,7 +4487,7 @@@ L:      video4linux-list@redhat.co
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  
- USER-MODE LINUX
+ USER-MODE LINUX (UML)
  P:    Jeff Dike
  M:    jdike@addtoit.com
  L:    user-mode-linux-devel@lists.sourceforge.net
@@@ -4443,7 -4499,14 +4511,14 @@@ W:    http://kernel.org/~kzak/util-linux-n
  T:    git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
  S:    Maintained
  
- VFAT/FAT/MSDOS FILESYSTEM:
+ UVESAFB DRIVER
+ P:    Michal Januszewski
+ M:    spock@gentoo.org
+ L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ W:    http://dev.gentoo.org/~spock/projects/uvesafb/
+ S:    Maintained
+ 
+ VFAT/FAT/MSDOS FILESYSTEM
  P:    OGAWA Hirofumi
  M:    hirofumi@mail.parknet.co.jp
  L:    linux-kernel@vger.kernel.org
@@@ -4460,13 -4523,21 +4535,21 @@@ M:   khali@linux-fr.or
  L:    i2c@lm-sensors.org
  S:    Maintained
  
+ VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
+ P:    Joseph Chan
+ M:    JosephChan@via.com.tw
+ P:    Scott Fang
+ M:    ScottFang@viatech.com.cn
+ L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ S:    Maintained
+ 
  VIA VELOCITY NETWORK DRIVER
  P:    Francois Romieu
  M:    romieu@fr.zoreil.com
  L:    netdev@vger.kernel.org
  S:    Maintained
  
- VIDEO FOR LINUX
+ VIDEO FOR LINUX (V4L)
  P:    Mauro Carvalho Chehab
  M:    mchehab@infradead.org
  M:    v4l-dvb-maintainer@linuxtv.org
@@@ -4483,10 -4554,11 +4566,11 @@@ S:   Maintaine
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  P:    Liam Girdwood
- M:    lg@opensource.wolfsonmicro.com
+ M:    lrg@slimlogic.co.uk
  P:    Mark Brown
  M:    broonie@opensource.wolfsonmicro.com
  W:    http://opensource.wolfsonmicro.com/node/15
+ W:    http://www.slimlogic.co.uk/?page_id=5
  T:    git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
  S:    Supported
  
@@@ -4544,11 -4616,6 +4628,11 @@@ M:    zaga@fly.cc.fer.h
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 +WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
 +P:    David Vrabel
 +M:    david.vrabel@csr.com
 +S:    Maintained
 +
  WISTRON LAPTOP BUTTON DRIVER
  P:    Miloslav Trmac
  M:    mitr@volny.cz
@@@ -4565,7 -4632,7 +4649,7 @@@ WM97XX TOUCHSCREEN DRIVER
  P:    Mark Brown
  M:    broonie@opensource.wolfsonmicro.com
  P:    Liam Girdwood
- M:    liam.girdwood@wolfsonmicro.com
+ M:    lrg@slimlogic.co.uk
  L:    linux-input@vger.kernel.org
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-touch
  W:    http://opensource.wolfsonmicro.com/node/7
@@@ -4577,6 -4644,17 +4661,17 @@@ M:    eis@baty.hanse.d
  L:    linux-x25@vger.kernel.org
  S:    Maintained
  
+ X86 ARCHITECTURE (32-BIT AND 64-BIT)
+ P:    Thomas Gleixner
+ M:    tglx@linutronix.de
+ P:    Ingo Molnar
+ M:    mingo@redhat.com
+ P:    H. Peter Anvin
+ M:    hpa@zytor.com
+ L:    linux-kernel@vger.kernel.org
+ T:    git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
+ S:    Maintained
+ 
  XEN HYPERVISOR INTERFACE
  P:    Jeremy Fitzhardinge
  M:    jeremy@xensource.com
@@@ -4608,17 -4686,6 +4703,6 @@@ M:     jacmet@sunsite.d
  L:    linux-serial@vger.kernel.org
  S:    Maintained
  
- X86 ARCHITECTURE (32-BIT AND 64-BIT)
- P:    Thomas Gleixner
- M:    tglx@linutronix.de
- P:    Ingo Molnar
- M:    mingo@redhat.com
- P:    H. Peter Anvin
- M:    hpa@zytor.com
- L:    linux-kernel@vger.kernel.org
- T:    git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
- S:    Maintained
- 
  YAM DRIVER FOR AX.25
  P:    Jean-Paul Roubelat
  M:    jpr@f6fbb.org

diff --combined arch/arm/Kconfig
index 8eedbfa52f0041f0a8dab30c6fd9e916657d0bb7,4853f9df37bd22a037f122bd7d78a9a6600cc474..e1521f32e554451a9f29c4720f69c61280adee4d
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -8,6 -8,7 +8,7 @@@ mainmenu "Linux Kernel Configuration
  config ARM
        bool
        default y
+       select HAVE_AOUT
        select HAVE_IDE
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
@@@ -140,15 -141,11 +141,11 @@@ config GENERIC_CALIBRATE_DELA
        bool
        default y
  
- config ARCH_SUPPORTS_AOUT
-       def_bool y
- 
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
  config ZONE_DMA
        bool
-       default y
  
  config GENERIC_ISA_DMA
        bool
@@@ -178,6 -175,11 +175,11 @@@ config OPROFILE_MPCOR
  config OPROFILE_ARM11_CORE
        bool
  
+ config OPROFILE_ARMV7
+       def_bool y
+       depends on CPU_V7 && !SMP
+       bool
+ 
  endif
  
  config VECTORS_BASE
@@@ -245,6 -247,7 +247,7 @@@ config ARCH_CLPS750
        select TIMER_ACORN
        select ISA
        select NO_IOPORT
+       select ARCH_SPARSEMEM_ENABLE
        help
          Support for the Cirrus Logic PS7500FE system-on-a-chip.
  
@@@ -306,6 -309,7 +309,7 @@@ config ARCH_IOP13X
        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI
+       select VMSPLIT_1G
        help
          Support for Intel's IOP13XX (XScale) family of processors.
  
@@@ -350,6 -354,7 +354,7 @@@ config ARCH_IXP4X
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
+       select ZONE_DMA if PCI
        help
          Support for Intel's IXP4XX (XScale) family of processors.
  
@@@ -434,7 -439,7 +439,7 @@@ config ARCH_ORION5
        help
          Support for the following Marvell Orion 5x series SoCs:
          Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
-         Orion-2 (5281).
+         Orion-2 (5281), Orion-1-90 (6183).
  
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
@@@ -464,6 -469,7 +469,7 @@@ config ARCH_RP
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API
        select NO_IOPORT
+       select ARCH_SPARSEMEM_ENABLE
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
@@@ -471,9 -477,7 +477,7 @@@
  config ARCH_SA1100
        bool "SA1100-based"
        select ISA
-       select ARCH_DISCONTIGMEM_ENABLE
        select ARCH_SPARSEMEM_ENABLE
-       select ARCH_SELECT_MEMORY_MODEL
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select GENERIC_TIME
@@@ -497,6 -501,7 +501,7 @@@ config ARCH_SHAR
        bool "Shark"
        select ISA
        select ISA_DMA
+       select ZONE_DMA
        select PCI
        help
          Support for the StrongARM based Digital DNARD machine, also known
@@@ -504,6 -509,8 +509,8 @@@
  
  config ARCH_LH7A40X
        bool "Sharp LH7A40X"
+       select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
+       select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
        help
          Say Y here for systems based on one of the Sharp LH7A40X
          System on a Chip processors.  These CPUs include an ARM922T
@@@ -515,7 -522,9 +522,9 @@@ config ARCH_DAVINC
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
        select HAVE_CLK
+       select ZONE_DMA
        help
          Support for TI's DaVinci platform.
  
@@@ -734,6 -743,29 +743,29 @@@ config SM
  
          If you don't know what to do here, say N.
  
+ choice
+       prompt "Memory split"
+       default VMSPLIT_3G
+       help
+         Select the desired split between kernel and user memory.
+ 
+         If you are not absolutely sure what you are doing, leave this
+         option alone!
+ 
+       config VMSPLIT_3G
+               bool "3G/1G user/kernel split"
+       config VMSPLIT_2G
+               bool "2G/2G user/kernel split"
+       config VMSPLIT_1G
+               bool "1G/3G user/kernel split"
+ endchoice
+ 
+ config PAGE_OFFSET
+       hex
+       default 0x40000000 if VMSPLIT_1G
+       default 0x80000000 if VMSPLIT_2G
+       default 0xC0000000
+ 
  config NR_CPUS
        int "Maximum number of CPUs (2-32)"
        range 2 32
@@@ -815,20 -847,18 +847,18 @@@ config ARCH_FLATMEM_HAS_HOLE
        default y
        depends on FLATMEM
  
+ # Discontigmem is deprecated
  config ARCH_DISCONTIGMEM_ENABLE
        bool
-       default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
-       help
-         Say Y to support efficient handling of discontiguous physical memory,
-         for architectures which are either NUMA (Non-Uniform Memory Access)
-         or have huge holes in the physical address space for other reasons.
-         See <file:Documentation/vm/numa> for more.
  
  config ARCH_SPARSEMEM_ENABLE
        bool
  
+ config ARCH_SPARSEMEM_DEFAULT
+       def_bool ARCH_SPARSEMEM_ENABLE
+ 
  config ARCH_SELECT_MEMORY_MODEL
-       bool
+       def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE
  
  config NODES_SHIFT
        int
@@@ -845,7 -875,7 +875,7 @@@ config LED
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-                  ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+                  ARCH_AT91 || ARCH_DAVINCI || \
                   ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used
@@@ -1005,9 -1035,9 +1035,9 @@@ config ATAGS_PRO
  
  endmenu
  
- if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
+ menu "CPU Power Management"
  
- menu "CPU Frequency scaling"
+ if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
  
  source "drivers/cpufreq/Kconfig"
  
@@@ -1047,10 -1077,12 +1077,12 @@@ config CPU_FREQ_PX
        default y
        select CPU_FREQ_DEFAULT_GOV_USERSPACE
  
- endmenu
- 
  endif
  
+ source "drivers/cpuidle/Kconfig"
+ 
+ endmenu
+ 
  menu "Floating point emulation"
  
  comment "At least one emulation must be selected"
@@@ -1202,6 -1234,8 +1234,8 @@@ source "drivers/power/Kconfig
  
  source "drivers/hwmon/Kconfig"
  
+ source "drivers/thermal/Kconfig"
+ 
  source "drivers/watchdog/Kconfig"
  
  source "drivers/ssb/Kconfig"
@@@ -1220,10 -1254,12 +1254,14 @@@ source "drivers/hid/Kconfig
  
  source "drivers/usb/Kconfig"
  
 +source "drivers/uwb/Kconfig"
 +
  source "drivers/mmc/Kconfig"
  
+ source "drivers/memstick/Kconfig"
+ 
+ source "drivers/accessibility/Kconfig"
+ 
  source "drivers/leds/Kconfig"
  
  source "drivers/rtc/Kconfig"
@@@ -1232,6 -1268,8 +1270,8 @@@ source "drivers/dma/Kconfig
  
  source "drivers/dca/Kconfig"
  
+ source "drivers/auxdisplay/Kconfig"
+ 
  source "drivers/regulator/Kconfig"
  
  source "drivers/uio/Kconfig"

diff --combined arch/h8300/Kconfig
index 2b413325e885eb399233001f2b424bf8c334a920,c7966746fbfec582938b77a37baaed384d1b0ec2..7789c3d82d3c3da990f49ddc1a3e202cfbaa3858
--- 1/arch/h8300/Kconfig
--- 2/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@@ -62,13 -62,14 +62,14 @@@ config GENERIC_TIM
        bool
        default y
  
+ config GENERIC_BUG
+         bool
+         depends on BUG
+ 
  config TIME_LOW_RES
        bool
        default y
  
- config ARCH_SUPPORTS_AOUT
-       def_bool y
- 
  config NO_IOPORT
        def_bool y
  
@@@ -213,8 -214,6 +214,8 @@@ source "drivers/hwmon/Kconfig
  
  source "drivers/usb/Kconfig"
  
 +source "drivers/uwb/Kconfig"
 +
  endmenu
  
  source "fs/Kconfig"

diff --combined drivers/Kconfig
index 9b399a1bae8b95dba5a4b44fcbfc75a57973208a,d19b6f5a1106b5202d88ecbe0dccad43a129c369..d38f43f593d400e64ab7796c1f90760c66966caf
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -78,8 -78,6 +78,8 @@@ source "drivers/hid/Kconfig
  
  source "drivers/usb/Kconfig"
  
 +source "drivers/uwb/Kconfig"
 +
  source "drivers/mmc/Kconfig"
  
  source "drivers/memstick/Kconfig"
@@@ -103,4 -101,6 +103,6 @@@ source "drivers/auxdisplay/Kconfig
  source "drivers/uio/Kconfig"
  
  source "drivers/xen/Kconfig"
+ 
+ source "drivers/staging/Kconfig"
  endmenu

diff --combined drivers/Makefile
index 1a6930f9726a306b6cf392a87ef6bcb7b2c60e5b,46c8681a07f48cd89766e97155d2adb9f3b91454..cadc64fe8f68dc60ac5edf9e489b62ef913a4b5b
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -99,4 -99,4 +99,5 @@@ obj-$(CONFIG_OF)              += of
  obj-$(CONFIG_SSB)             += ssb/
  obj-$(CONFIG_VIRTIO)          += virtio/
  obj-$(CONFIG_REGULATOR)               += regulator/
+ obj-$(CONFIG_STAGING)         += staging/
 +obj-$(CONFIG_UWB)             += uwb/