Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

author Linus Torvalds <torvalds@linux-foundation.org>

Fri, 19 Mar 2010 16:43:06 +0000 (09:43 -0700)

committer Linus Torvalds <torvalds@linux-foundation.org>

Fri, 19 Mar 2010 16:43:06 +0000 (09:43 -0700)
author Linus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 16:43:06 +0000 (09:43 -0700)
committer Linus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Mar 2010 16:43:06 +0000 (09:43 -0700)
diff --combined Documentation/ioctl/ioctl-number.txt

index 35c9b51,91cfdd7..dd5806f
--- 1/Documentation/ioctl/ioctl-number.txt
--- 2/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@@ -56,11 -56,10 +56,11 @@@ Following this convention is good becau
   (5) When following the convention, the driver code can use generic
       code to copy the parameters between user and kernel space.
   
- -This table lists ioctls visible from user land for Linux/i386.  It contains
- -most drivers up to 2.3.14, but I know I am missing some.
+ +This table lists ioctls visible from user land for Linux/x86.  It contains
+ +most drivers up to 2.6.31, but I know I am missing some.  There has been
+ +no attempt to list non-X86 architectures or ioctls from drivers/staging/.
   
- -Code  Seq#    Include File            Comments
+ +Code  Seq#(hex)       Include File            Comments
   ========================================================
   0x00  00-1F   linux/fs.h              conflict!
   0x00  00-1F   scsi/scsi_ioctl.h       conflict!
@@@ -70,227 -69,120 +70,228 @@@
   0x03  all     linux/hdreg.h
   0x04  D2-DC   linux/umsdos_fs.h       Dead since 2.6.11, but don't reuse these.
   0x06  all     linux/lp.h
- -0x09  all     linux/md.h
+ +0x09  all     linux/raid/md_u.h
+ +0x10  00-0F   drivers/char/s390/vmcp.h
   0x12  all     linux/fs.h
                 linux/blkpg.h
   0x1b  all     InfiniBand Subsystem    <http://www.openib.org/>
   0x20  all     drivers/cdrom/cm206.h
   0x22  all     scsi/sg.h
   '#'   00-3F   IEEE 1394 Subsystem     Block for the entire subsystem
+ +'$'   00-0F   linux/perf_counter.h, linux/perf_event.h
   '1'   00-1F   <linux/timepps.h>       PPS kit from Ulrich Windl
                                         <ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/>
+ +'2'   01-04   linux/i2o.h
+ +'3'   00-0F   drivers/s390/char/raw3270.h     conflict!
+ +'3'   00-1F   linux/suspend_ioctls.h  conflict!
+ +              and kernel/power/user.c
   '8'   all                             SNP8023 advanced NIC card
                                         <mailto:mcr@solidum.com>
- -'A'   00-1F   linux/apm_bios.h
+ +'@'   00-0F   linux/radeonfb.h        conflict!
+ +'@'   00-0F   drivers/video/aty/aty128fb.c    conflict!
+ +'A'   00-1F   linux/apm_bios.h        conflict!
+ +'A'   00-0F   linux/agpgart.h         conflict!
+ +              and drivers/char/agp/compat_ioctl.h
+ +'A'   00-7F   sound/asound.h          conflict!
+ +'B'   00-1F   linux/cciss_ioctl.h     conflict!
+ +'B'   00-0F   include/linux/pmu.h     conflict!
   'B'   C0-FF                           advanced bbus
                                         <mailto:maassen@uni-freiburg.de>
- -'C'   all     linux/soundcard.h
+ +'C'   all     linux/soundcard.h       conflict!
+ +'C'   01-2F   linux/capi.h            conflict!
+ +'C'   F0-FF   drivers/net/wan/cosa.h  conflict!
   'D'   all     arch/s390/include/asm/dasd.h
- -'E'   all     linux/input.h
- -'F'   all     linux/fb.h
- -'H'   all     linux/hiddev.h
- -'I'   all     linux/isdn.h
+ +'D'   40-5F   drivers/scsi/dpt/dtpi_ioctl.h
+ +'D'   05      drivers/scsi/pmcraid.h
+ +'E'   all     linux/input.h           conflict!
+ +'E'   00-0F   xen/evtchn.h            conflict!
+ +'F'   all     linux/fb.h              conflict!
+ +'F'   01-02   drivers/scsi/pmcraid.h  conflict!
+ +'F'   20      drivers/video/fsl-diu-fb.h      conflict!
+ +'F'   20      drivers/video/intelfb/intelfb.h conflict!
+ +'F'   20      linux/ivtvfb.h          conflict!
+ +'F'   20      linux/matroxfb.h        conflict!
+ +'F'   20      drivers/video/aty/atyfb_base.c  conflict!
+ +'F'   00-0F   video/da8xx-fb.h        conflict!
+ +'F'   80-8F   linux/arcfb.h           conflict!
+ +'F'   DD      video/sstfb.h           conflict!
+ +'G'   00-3F   drivers/misc/sgi-gru/grulib.h   conflict!
+ +'G'   00-0F   linux/gigaset_dev.h     conflict!
+ +'H'   00-7F   linux/hiddev.h          conflict!
+ +'H'   00-0F   linux/hidraw.h          conflict!
+ +'H'   00-0F   sound/asound.h          conflict!
+ +'H'   20-40   sound/asound_fm.h       conflict!
+ +'H'   80-8F   sound/sfnt_info.h       conflict!
+ +'H'   10-8F   sound/emu10k1.h         conflict!
+ +'H'   10-1F   sound/sb16_csp.h        conflict!
+ +'H'   10-1F   sound/hda_hwdep.h       conflict!
+ +'H'   40-4F   sound/hdspm.h           conflict!
+ +'H'   40-4F   sound/hdsp.h            conflict!
+ +'H'   90      sound/usb/usx2y/usb_stream.h
+ +'H'   C0-F0   net/bluetooth/hci.h     conflict!
+ +'H'   C0-DF   net/bluetooth/hidp/hidp.h       conflict!
+ +'H'   C0-DF   net/bluetooth/cmtp/cmtp.h       conflict!
+ +'H'   C0-DF   net/bluetooth/bnep/bnep.h       conflict!
+ +'I'   all     linux/isdn.h            conflict!
+ +'I'   00-0F   drivers/isdn/divert/isdn_divert.h       conflict!
+ +'I'   40-4F   linux/mISDNif.h         conflict!
   'J'   00-1F   drivers/scsi/gdth_ioctl.h
   'K'   all     linux/kd.h
- -'L'   00-1F   linux/loop.h
- -'L'   20-2F   driver/usb/misc/vstusb.h
+ +'L'   00-1F   linux/loop.h            conflict!
+ +'L'   10-1F   drivers/scsi/mpt2sas/mpt2sas_ctl.h      conflict!
   'L'   E0-FF   linux/ppdd.h            encrypted disk device driver
                                         <http://linux01.gwdg.de/~alatham/ppdd.html>
- -'M'   all     linux/soundcard.h
+ +'M'   all     linux/soundcard.h       conflict!
+ +'M'   01-16   mtd/mtd-abi.h           conflict!
+ +              and drivers/mtd/mtdchar.c
+ +'M'   01-03   drivers/scsi/megaraid/megaraid_sas.h
+ +'M'   00-0F   drivers/video/fsl-diu-fb.h      conflict!
   'N'   00-1F   drivers/usb/scanner.h
- -'O'     00-02   include/mtd/ubi-user.h UBI
- -'P'   all     linux/soundcard.h
+ +'O'     00-06   mtd/ubi-user.h                UBI
+ +'P'   all     linux/soundcard.h       conflict!
+ +'P'   60-6F   sound/sscape_ioctl.h    conflict!
+ +'P'   00-0F   drivers/usb/class/usblp.c       conflict!
   'Q'   all     linux/soundcard.h
- -'R'   00-1F   linux/random.h
+ +'R'   00-1F   linux/random.h          conflict!
+ +'R'   01      linux/rfkill.h          conflict!
+ +'R'   01-0F   media/rds.h             conflict!
+ +'R'   C0-DF   net/bluetooth/rfcomm.h
   'S'   all     linux/cdrom.h           conflict!
   'S'   80-81   scsi/scsi_ioctl.h       conflict!
   'S'   82-FF   scsi/scsi.h             conflict!
+ +'S'   00-7F   sound/asequencer.h      conflict!
   'T'   all     linux/soundcard.h       conflict!
+ +'T'   00-AF   sound/asound.h          conflict!
   'T'   all     arch/x86/include/asm/ioctls.h   conflict!
- -'U'   00-EF   linux/drivers/usb/usb.h
- -'V'   all     linux/vt.h
+ +'T'   C0-DF   linux/if_tun.h          conflict!
+ +'U'   all     sound/asound.h          conflict!
+ +'U'   00-0F   drivers/media/video/uvc/uvcvideo.h      conflict!
+ +'U'   00-CF   linux/uinput.h          conflict!
+ +'U'   00-EF   linux/usbdevice_fs.h
+ +'U'   C0-CF   drivers/bluetooth/hci_uart.h
+ +'V'   all     linux/vt.h              conflict!
+ +'V'   all     linux/videodev2.h       conflict!
+ +'V'   C0      linux/ivtvfb.h          conflict!
+ +'V'   C0      linux/ivtv.h            conflict!
+ +'V'   C0      media/davinci/vpfe_capture.h    conflict!
+ +'V'   C0      media/si4713.h          conflict!
+ +'V'   C0-CF   drivers/media/video/mxb.h       conflict!
   'W'   00-1F   linux/watchdog.h        conflict!
   'W'   00-1F   linux/wanrouter.h       conflict!
- -'X'   all     linux/xfs_fs.h
+ +'W'   00-3F   sound/asound.h          conflict!
+ +'X'   all     fs/xfs/xfs_fs.h         conflict!
+ +              and fs/xfs/linux-2.6/xfs_ioctl32.h
+ +              and include/linux/falloc.h
+ +              and linux/fs.h
+ +'X'   all     fs/ocfs2/ocfs_fs.h      conflict!
+ +'X'   01      linux/pktcdvd.h         conflict!
   'Y'   all     linux/cyclades.h
- -'['   00-07   linux/usb/usbtmc.h      USB Test and Measurement Devices
+ +'Z'   14-15   drivers/message/fusion/mptctl.h
+ +'['   00-07   linux/usb/tmc.h         USB Test and Measurement Devices
                                         <mailto:gregkh@suse.de>
- -'a'   all                             ATM on linux
+ +'a'   all     linux/atm*.h, linux/sonet.h     ATM on linux
                                         <http://lrcwww.epfl.ch/linux-atm/magic.html>
- -'b'   00-FF                           bit3 vme host bridge
+ +'b'   00-FF                           conflict! bit3 vme host bridge
                                         <mailto:natalia@nikhefk.nikhef.nl>
+ +'b'   00-0F   media/bt819.h           conflict!
+ +'c'   all     linux/cm4000_cs.h       conflict!
   'c'   00-7F   linux/comstats.h        conflict!
   'c'   00-7F   linux/coda.h            conflict!
- -'c'   80-9F   arch/s390/include/asm/chsc.h
- -'c'   A0-AF   arch/x86/include/asm/msr.h
+ +'c'   00-1F   linux/chio.h            conflict!
+ +'c'   80-9F   arch/s390/include/asm/chsc.h    conflict!
+ +'c'   A0-AF   arch/x86/include/asm/msr.h      conflict!
   'd'   00-FF   linux/char/drm/drm/h    conflict!
+ +'d'   02-40   pcmcia/ds.h             conflict!
+ +'d'   10-3F   drivers/media/video/dabusb.h    conflict!
+ +'d'   C0-CF   drivers/media/video/saa7191.h   conflict!
   'd'   F0-FF   linux/digi1.h
   'e'   all     linux/digi1.h           conflict!
- -'e'   00-1F   net/irda/irtty.h        conflict!
- -'f'   00-1F   linux/ext2_fs.h
- -'h'   00-7F                           Charon filesystem
+ +'e'   00-1F   drivers/net/irda/irtty-sir.h    conflict!
+ +'f'   00-1F   linux/ext2_fs.h         conflict!
+ +'f'   00-1F   linux/ext3_fs.h         conflict!
+ +'f'   00-0F   fs/jfs/jfs_dinode.h     conflict!
+ +'f'   00-0F   fs/ext4/ext4.h          conflict!
+ +'f'   00-0F   linux/fs.h              conflict!
+ +'f'   00-0F   fs/ocfs2/ocfs2_fs.h     conflict!
+ +'g'   00-0F   linux/usb/gadgetfs.h
+ +'g'   20-2F   linux/usb/g_printer.h
+ +'h'   00-7F                           conflict! Charon filesystem
                                         <mailto:zapman@interlan.net>
- -'i'   00-3F   linux/i2o.h
+ +'h'   00-1F   linux/hpet.h            conflict!
+ +'i'   00-3F   linux/i2o-dev.h         conflict!
+ +'i'   0B-1F   linux/ipmi.h            conflict!
+ +'i'   80-8F   linux/i8k.h
   'j'   00-3F   linux/joystick.h
+ +'k'   00-0F   linux/spi/spidev.h      conflict!
+ +'k'   00-05   video/kyro.h            conflict!
   'l'   00-3F   linux/tcfs_fs.h         transparent cryptographic file system
                                         <http://mikonos.dia.unisa.it/tcfs>
   'l'   40-7F   linux/udf_fs_i.h        in development:
                                         <http://sourceforge.net/projects/linux-udf/>
- -'m'   00-09   linux/mmtimer.h
+ +'m'   00-09   linux/mmtimer.h         conflict!
   'm'   all     linux/mtio.h            conflict!
   'm'   all     linux/soundcard.h       conflict!
   'm'   all     linux/synclink.h        conflict!
+ +'m'   00-19   drivers/message/fusion/mptctl.h conflict!
+ +'m'   00      drivers/scsi/megaraid/megaraid_ioctl.h  conflict!
   'm'   00-1F   net/irda/irmod.h        conflict!
- -'n'   00-7F   linux/ncp_fs.h
+ +'n'   00-7F   linux/ncp_fs.h and fs/ncpfs/ioctl.c
   'n'   80-8F   linux/nilfs2_fs.h       NILFS2
- -'n'   E0-FF   video/matrox.h          matroxfb
+ +'n'   E0-FF   linux/matroxfb.h        matroxfb
   'o'   00-1F   fs/ocfs2/ocfs2_fs.h     OCFS2
- -'o'     00-03   include/mtd/ubi-user.h  conflict! (OCFS2 and UBI overlaps)
- -'o'     40-41   include/mtd/ubi-user.h  UBI
- -'o'     01-A1   include/linux/dvb/*.h DVB
+ +'o'     00-03   mtd/ubi-user.h                conflict! (OCFS2 and UBI overlaps)
+ +'o'     40-41   mtd/ubi-user.h                UBI
+ +'o'     01-A1   linux/dvb/*.h         DVB
   'p'   00-0F   linux/phantom.h         conflict! (OpenHaptics needs this)
+ +'p'   00-1F   linux/rtc.h             conflict!
   'p'   00-3F   linux/mc146818rtc.h     conflict!
   'p'   40-7F   linux/nvram.h
- -'p'   80-9F                           user-space parport
+ +'p'   80-9F   linux/ppdev.h           user-space parport
                                         <mailto:tim@cyberelk.net>
- -'p'   a1-a4   linux/pps.h             LinuxPPS
+ +'p'   A1-A4   linux/pps.h             LinuxPPS
                                         <mailto:giometti@linux.it>
   'q'   00-1F   linux/serio.h
- -'q'   80-FF                           Internet PhoneJACK, Internet LineJACK
- -                                      <http://www.quicknet.net>
- -'r'   00-1F   linux/msdos_fs.h
+ +'q'   80-FF   linux/telephony.h       Internet PhoneJACK, Internet LineJACK
+ +              linux/ixjuser.h         <http://www.quicknet.net>
+ +'r'   00-1F   linux/msdos_fs.h and fs/fat/dir.c
   's'   all     linux/cdk.h
   't'   00-7F   linux/if_ppp.h
   't'   80-8F   linux/isdn_ppp.h
+ +'t'   90      linux/toshiba.h
   'u'   00-1F   linux/smb_fs.h
- -'v'   00-1F   linux/ext2_fs.h         conflict!
   'v'   all     linux/videodev.h        conflict!
+ +'v'   00-1F   linux/ext2_fs.h         conflict!
+ +'v'   00-1F   linux/fs.h              conflict!
+ +'v'   00-0F   linux/sonypi.h          conflict!
+ +'v'   C0-CF   drivers/media/video/ov511.h     conflict!
+ +'v'   C0-DF   media/pwc-ioctl.h       conflict!
+ +'v'   C0-FF   linux/meye.h            conflict!
+ +'v'   C0-CF   drivers/media/video/zoran/zoran.h       conflict!
+ +'v'   D0-DF   drivers/media/video/cpia2/cpia2dev.h    conflict!
   'w'   all                             CERN SCI driver
   'y'   00-1F                           packet based user level communications
                                         <mailto:zapman@interlan.net>
- -'z'   00-3F                           CAN bus card
+ +'z'   00-3F                           CAN bus card    conflict!
                                         <mailto:hdstich@connectu.ulm.circular.de>
- -'z'   40-7F                           CAN bus card
+ +'z'   40-7F                           CAN bus card    conflict!
                                         <mailto:oe@port.de>
+ +'z'   10-4F   drivers/s390/crypto/zcrypt_api.h        conflict!
   0x80  00-1F   linux/fb.h
   0x81  00-1F   linux/videotext.h
+ +0x88  00-3F   media/ovcamchip.h
   0x89  00-06   arch/x86/include/asm/sockios.h
   0x89  0B-DF   linux/sockios.h
   0x89  E0-EF   linux/sockios.h         SIOCPROTOPRIVATE range
+ +0x89  E0-EF   linux/dn.h              PROTOPRIVATE range
   0x89  F0-FF   linux/sockios.h         SIOCDEVPRIVATE range
   0x8B  all     linux/wireless.h
   0x8C  00-3F                           WiNRADiO driver
                                         <http://www.proximity.com.au/~brian/winradio/>
   0x90  00      drivers/cdrom/sbpcd.h
+ +0x92  00-0F   drivers/usb/mon/mon_bin.c
   0x93  60-7F   linux/auto_fs.h
- -0x97    00-7F   fs/ceph/ioctl.h         Ceph file system
+ +0x94  all     fs/btrfs/ioctl.h
++0x97  00-7F   fs/ceph/ioctl.h         Ceph file system
   0x99  00-0F                           537-Addinboard driver
                                         <mailto:buk@buks.ipn.de>
   0xA0  all     linux/sdp/sdp.h         Industrial Device Project
@@@ -301,22 -193,17 +302,22 @@@
   0xAB  00-1F   linux/nbd.h
   0xAC  00-1F   linux/raw.h
   0xAD  00      Netfilter device        in development:
- -                                      <mailto:rusty@rustcorp.com.au>  
+ +                                      <mailto:rusty@rustcorp.com.au>
   0xAE  all     linux/kvm.h             Kernel-based Virtual Machine
                                         <mailto:kvm@vger.kernel.org>
   0xB0  all     RATIO devices           in development:
                                         <mailto:vgo@ratio.de>
   0xB1  00-1F   PPPoX                   <mailto:mostrows@styx.uwaterloo.ca>
+ +0xC0  00-0F   linux/usb/iowarrior.h
   0xCB  00-1F   CBM serial IEC bus      in development:
                                         <mailto:michael.klein@puffin.lb.shuttle.de>
+ +0xCD  01      linux/reiserfs_fs.h
+ +0xCF  02      fs/cifs/ioctl.c
+ +0xDB  00-0F   drivers/char/mwave/mwavepub.h
   0xDD  00-3F   ZFCP device driver      see drivers/s390/scsi/
                                         <mailto:aherrman@de.ibm.com>
- -0xF3  00-3F   video/sisfb.h           sisfb (in development)
+ +0xF3  00-3F   drivers/usb/misc/sisusbvga/sisusb.h     sisfb (in development)
                                         <mailto:thomas@winischhofer.net>
   0xF4  00-1F   video/mbxfb.h           mbxfb
                                         <mailto:raph@8d.com>
+ +0xFD  all     linux/dm-ioctl.h
diff --combined MAINTAINERS

index 382eaa4,6fc10aa..449d444
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -65,52 -65,43 +65,52 @@@ trivial patch so apply some common sens
   
   8.    Happy hacking.
   
- -              -----------------------------------
- -
- -Maintainers List (try to look for most precise areas first)
+ +Descriptions of section entries:
+ +
+ +      P: Person (obsolete)
+ +      M: Mail patches to: FullName <address@domain>
+ +      L: Mailing list that is relevant to this area
+ +      W: Web-page with status/info
+ +      Q: Patchwork web based patch tracking system site
+ +      T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
+ +      S: Status, one of the following:
+ +         Supported:   Someone is actually paid to look after this.
+ +         Maintained:  Someone actually looks after it.
+ +         Odd Fixes:   It has a maintainer but they don't have time to do
+ +                      much other than throw the odd patch in. See below..
+ +         Orphan:      No current maintainer [but maybe you could take the
+ +                      role as you write your new code].
+ +         Obsolete:    Old code. Something tagged obsolete generally means
+ +                      it has been replaced by a better system and you
+ +                      should be using that.
+ +      F: Files and directories with wildcard patterns.
+ +         A trailing slash includes all files and subdirectory files.
+ +         F:   drivers/net/    all files in and below drivers/net
+ +         F:   drivers/net/*   all files in drivers/net, but not below
+ +         F:   */net/*         all files in "any top level directory"/net
+ +         One pattern per line.  Multiple F: lines acceptable.
+ +      X: Files and directories that are NOT maintained, same rules as F:
+ +         Files exclusions are tested before file matches.
+ +         Can be useful for excluding a specific subdirectory, for instance:
+ +         F:   net/
+ +         X:   net/ipv6/
+ +         matches all files in and below net excluding net/ipv6/
+ +      K: Keyword perl extended regex pattern to match content in a
+ +         patch or file.  For instance:
+ +         K: of_get_profile
+ +            matches patches or files that contain "of_get_profile"
+ +         K: \b(printk|pr_(info|err))\b
+ +            matches patches or files that contain one or more of the words
+ +            printk, pr_info or pr_err
+ +         One regex pattern per line.  Multiple K: lines acceptable.
   
   Note: For the hard of thinking, this list is meant to remain in alphabetical
   order. If you could add yourselves to it in alphabetical order that would be
   so much easier [Ed]
   
- -P: Person (obsolete)
- -M: Mail patches to: FullName <address@domain>
- -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, stgit.
- -S: Status, one of the following:
- -
- -      Supported:      Someone is actually paid to look after this.
- -      Maintained:     Someone actually looks after it.
- -      Odd Fixes:      It has a maintainer but they don't have time to do
- -                      much other than throw the odd patch in. See below..
- -      Orphan:         No current maintainer [but maybe you could take the
- -                      role as you write your new code].
- -      Obsolete:       Old code. Something tagged obsolete generally means
- -                      it has been replaced by a better system and you
- -                      should be using that.
+ +Maintainers List (try to look for most precise areas first)
   
- -F: Files and directories with wildcard patterns.
- -   A trailing slash includes all files and subdirectory files.
- -      F:      drivers/net/    all files in and below drivers/net
- -      F:      drivers/net/*   all files in drivers/net, but not below
- -      F:      */net/*         all files in "any top level directory"/net
- -   One pattern per line.  Multiple F: lines acceptable.
- -X: Files and directories that are NOT maintained, same rules as F:
- -   Files exclusions are tested before file matches.
- -   Can be useful for excluding a specific subdirectory, for instance:
- -      F:      net/
- -      X:      net/ipv6/
- -   matches all files in and below net excluding net/ipv6/
+ +              -----------------------------------
   
   3C505 NETWORK DRIVER
   M:    Philip Blundell <philb@gnu.org>
@@@ -183,8 -174,7 +183,8 @@@ M: Ron Minnich <rminnich@sandia.gov
   M:    Latchesar Ionkov <lucho@ionkov.net>
   L:    v9fs-developer@lists.sourceforge.net
   W:    http://swik.net/v9fs
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git
+ +Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
   S:    Maintained
   F:    Documentation/filesystems/9p.txt
   F:    fs/9p/
@@@ -223,7 -213,6 +223,7 @@@ F: drivers/net/acenic
   
   ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
   M:    Peter Feuerer <peter@piie.net>
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://piie.net/?section=acerhdf
   S:    Maintained
   F:    drivers/platform/x86/acerhdf.c
@@@ -231,7 -220,6 +231,7 @@@
   ACER WMI LAPTOP EXTRAS
   M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
   L:    aceracpi@googlegroups.com (subscribers-only)
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://code.google.com/p/aceracpi
   S:    Maintained
   F:    drivers/platform/x86/acer-wmi.c
@@@ -240,7 -228,6 +240,7 @@@ ACP
   M:    Len Brown <lenb@kernel.org>
   L:    linux-acpi@vger.kernel.org
   W:    http://www.lesswatts.org/projects/acpi/
+ +Q:    http://patchwork.kernel.org/project/linux-acpi/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
   S:    Supported
   F:    drivers/acpi/
@@@ -270,13 -257,6 +270,13 @@@ W:       http://www.lesswatts.org/projects/ac
   S:    Supported
   F:    drivers/acpi/fan.c
   
+ +ACPI PROCESSOR AGGREGATOR DRIVER
+ +M:    Shaohua Li <shaohua.li@intel.com>
+ +L:    linux-acpi@vger.kernel.org
+ +W:    http://www.lesswatts.org/projects/acpi/
+ +S:    Supported
+ +F:    drivers/acpi/acpi_pad.c
+ +
   ACPI THERMAL DRIVER
   M:    Zhang Rui <rui.zhang@intel.com>
   L:    linux-acpi@vger.kernel.org
@@@ -293,7 -273,7 +293,7 @@@ F: drivers/acpi/video.
   
   ACPI WMI DRIVER
   M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
- -L:    linux-acpi@vger.kernel.org
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://www.lesswatts.org/projects/acpi/
   S:    Maintained
   F:    drivers/platform/x86/wmi.c
@@@ -332,13 -312,6 +332,13 @@@ M:       Colin Leroy <colin@colino.net
   S:    Maintained
   F:    drivers/macintosh/therm_adt746x.c
   
+ +ADT7475 HARDWARE MONITOR DRIVER
+ +M:    Jean Delvare <khali@linux-fr.org>
+ +L:    lm-sensors@lm-sensors.org
+ +S:    Maintained
+ +F:    Documentation/hwmon/adt7475
+ +F:    drivers/hwmon/adt7475.c
+ +
   ADVANSYS SCSI DRIVER
   M:    Matthew Wilcox <matthew@wil.cx>
   L:    linux-scsi@vger.kernel.org
@@@ -415,8 -388,9 +415,8 @@@ F: drivers/i2c/busses/i2c-ali1563.
   
   ALPHA PORT
   M:    Richard Henderson <rth@twiddle.net>
- -S:    Odd Fixes for 2.4; Maintained for 2.6.
   M:    Ivan Kokshaysky <ink@jurassic.park.msu.ru>
- -S:    Maintained for 2.4; PCI support for 2.6.
+ +M:    Matt Turner <mattst88@gmail.com>
   L:    linux-alpha@vger.kernel.org
   F:    arch/alpha/
   
@@@ -431,6 -405,7 +431,6 @@@ P: Jordan Crous
   L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
   W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
   S:    Supported
- -F:    arch/x86/kernel/geode_32.c
   F:    drivers/char/hw_random/geode-rng.c
   F:    drivers/crypto/geode*
   F:    drivers/video/geode/
@@@ -496,6 -471,13 +496,6 @@@ S:        Maintaine
   F:    drivers/net/appletalk/
   F:    net/appletalk/
   
- -APPLETOUCH TOUCHPAD DRIVER
- -M:    Johannes Berg <johannes@sipsolutions.net>
- -L:    linux-input@vger.kernel.org
- -S:    Maintained
- -F:    Documentation/input/appletouch.txt
- -F:    drivers/input/mouse/appletouch.c
- -
   ARC FRAMEBUFFER DRIVER
   M:    Jaya Kumar <jayalk@intworks.biz>
   S:    Maintained
@@@ -515,32 -497,10 +515,32 @@@ W:      http://www.arm.linux.org.uk
   S:    Maintained
   F:    arch/arm/
   
+ +ARM PRIMECELL AACI PL041 DRIVER
+ +M:    Russell King <linux@arm.linux.org.uk>
+ +S:    Maintained
+ +F:    sound/arm/aaci.*
+ +
+ +ARM PRIMECELL CLCD PL110 DRIVER
+ +M:    Russell King <linux@arm.linux.org.uk>
+ +S:    Maintained
+ +F:    drivers/video/amba-clcd.*
+ +
+ +ARM PRIMECELL KMI PL050 DRIVER
+ +M:    Russell King <linux@arm.linux.org.uk>
+ +S:    Maintained
+ +F:    drivers/input/serio/ambakmi.*
+ +F:    include/linux/amba/kmi.h
+ +
   ARM PRIMECELL MMCI PL180/1 DRIVER
   S:    Orphan
   F:    drivers/mmc/host/mmci.*
   
+ +ARM PRIMECELL BUS SUPPORT
+ +M:    Russell King <linux@arm.linux.org.uk>
+ +S:    Maintained
+ +F:    drivers/amba/
+ +F:    include/linux/amba/bus.h
+ +
   ARM/ADI ROADRUNNER MACHINE SUPPORT
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -610,20 -570,15 +610,20 @@@ M:      Mike Rapoport <mike@compulab.co.il
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   
+ +ARM/CONTEC MICRO9 MACHINE SUPPORT
+ +M:    Hubert Feurstein <hubert.feurstein@contec.at>
+ +S:    Maintained
+ +F:    arch/arm/mach-ep93xx/micro9.c
+ +
   ARM/CORGI MACHINE SUPPORT
   M:    Richard Purdie <rpurdie@rpsys.net>
   S:    Maintained
   
   ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
- -M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ +M:    Paulius Zaleckas <paulius.zaleckas@gmail.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   T:    git git://gitorious.org/linux-gemini/mainline.git
- -S:    Maintained
+ +S:    Odd Fixes
   F:    arch/arm/mach-gemini/
   
   ARM/EBSA110 MACHINE SUPPORT
@@@ -645,9 -600,9 +645,9 @@@ T: topgit git://git.openezx.org/openezx
   F:    arch/arm/mach-pxa/ezx.c
   
   ARM/FARADAY FA526 PORT
- -M:    Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
+ +M:    Paulius Zaleckas <paulius.zaleckas@gmail.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -S:    Maintained
+ +S:    Odd Fixes
   F:    arch/arm/mm/*-fa*
   
   ARM/FOOTBRIDGE ARCHITECTURE
@@@ -662,15 -617,6 +662,15 @@@ ARM/FREESCALE IMX / MXC ARM ARCHITECTUR
   M:    Sascha Hauer <kernel@pengutronix.de>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
+ +T:    git://git.pengutronix.de/git/imx/linux-2.6.git
+ +F:    arch/arm/mach-mx*/
+ +F:    arch/arm/plat-mxc/
+ +
+ +ARM/FREESCALE IMX51
+ +M:    Amit Kucheria <amit.kucheria@canonical.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    arch/arm/mach-mx5/
   
   ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
   M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -700,24 -646,24 +700,24 @@@ ARM/INTEL IOP32X ARM ARCHITECTUR
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   M:    Dan Williams <dan.j.williams@intel.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -S:    Supported
+ +S:    Maintained
   
   ARM/INTEL IOP33X ARM ARCHITECTURE
   M:    Dan Williams <dan.j.williams@intel.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -S:    Supported
+ +S:    Maintained
   
   ARM/INTEL IOP13XX ARM ARCHITECTURE
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   M:    Dan Williams <dan.j.williams@intel.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -S:    Supported
+ +S:    Maintained
   
   ARM/INTEL IQ81342EX MACHINE SUPPORT
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   M:    Dan Williams <dan.j.williams@intel.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -S:    Supported
+ +S:    Maintained
   
   ARM/INTEL IXP2000 ARM ARCHITECTURE
   M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -741,24 -687,11 +741,24 @@@ L:      linux-arm-kernel@lists.infradead.or
   S:    Maintained
   F:    arch/arm/mach-ixp4xx/
   
+ +ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
+ +M:    Jonathan Cameron <jic23@cam.ac.uk>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    arch/arm/mach-pxa/imote2.c
+ +
+ +ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+ +M:    Jonathan Cameron <jic23@cam.ac.uk>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    arch/arm/mach-pxa/stargate2.c
+ +F:    drivers/pcmcia/pxa2xx_stargate2.c
+ +
   ARM/INTEL XSC3 (MANZANO) ARM CORE
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   M:    Dan Williams <dan.j.williams@intel.com>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
- -S:    Supported
+ +S:    Maintained
   
   ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
   M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -796,69 -729,35 +796,69 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
   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/
+ +
   ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
   M:    Nelson Castillo <arhuaco@freaks-unidos.net>
   L:    openmoko-kernel@lists.openmoko.org (subscribers-only)
   W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
   S:    Supported
   
+ +ARM/QUALCOMM MSM MACHINE SUPPORT
+ +M:    David Brown <davidb@codeaurora.org>
+ +M:    Daniel Walker <dwalker@codeaurora.org>
+ +M:    Bryan Huntsman <bryanh@codeaurora.org>
+ +F:    arch/arm/mach-msm/
+ +F:    drivers/video/msm/
+ +F:    drivers/mmc/host/msm_sdcc.c
+ +F:    drivers/mmc/host/msm_sdcc.h
+ +F:    drivers/serial/msm_serial.h
+ +F:    drivers/serial/msm_serial.c
+ +T:    git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git
+ +S:    Maintained
+ +
   ARM/TOSA MACHINE SUPPORT
   M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
   M:    Dirk Opfer <dirk@opfer-online.de>
   S:    Maintained
   
   ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT
- -P:    Marek Vasut
- -M:    marek.vasut@gmail.com
+ +M:    Marek Vasut <marek.vasut@gmail.com>
   L:    linux-arm-kernel@lists.infradead.org
   W:    http://hackndev.com
   S:    Maintained
- -
- -ARM/PALM TREO 680 SUPPORT
+ +F:    arch/arm/mach-pxa/include/mach/palmtx.h
+ +F:    arch/arm/mach-pxa/palmtx.c
+ +F:    arch/arm/mach-pxa/include/mach/palmt5.h
+ +F:    arch/arm/mach-pxa/palmt5.c
+ +F:    arch/arm/mach-pxa/include/mach/palmld.h
+ +F:    arch/arm/mach-pxa/palmld.c
+ +F:    arch/arm/mach-pxa/include/mach/palmte2.h
+ +F:    arch/arm/mach-pxa/palmte2.c
+ +F:    arch/arm/mach-pxa/include/mach/palmtc.h
+ +F:    arch/arm/mach-pxa/palmtc.c
+ +
+ +ARM/PALM TREO SUPPORT
   M:    Tomas Cech <sleep_walker@suse.cz>
   L:    linux-arm-kernel@lists.infradead.org
   W:    http://hackndev.com
   S:    Maintained
+ +F:    arch/arm/mach-pxa/include/mach/palmtreo.h
+ +F:    arch/arm/mach-pxa/palmtreo.c
   
   ARM/PALMZ72 SUPPORT
   M:    Sergey Lapin <slapin@ossfans.org>
   L:    linux-arm-kernel@lists.infradead.org
   W:    http://hackndev.com
   S:    Maintained
+ +F:    arch/arm/mach-pxa/include/mach/palmz72.h
+ +F:    arch/arm/mach-pxa/palmz72.c
   
   ARM/PLEB SUPPORT
   M:    Peter Chubb <pleb@gelato.unsw.edu.au>
@@@ -945,16 -844,6 +945,16 @@@ W:       http://www.fluff.org/ben/linux
   S:    Maintained
   F:    arch/arm/mach-s3c6410/
   
+ +ARM/SHMOBILE ARM ARCHITECTURE
+ +M:    Paul Mundt <lethal@linux-sh.org>
+ +M:    Magnus Damm <magnus.damm@gmail.com>
+ +L:    linux-sh@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
+ +W:    http://oss.renesas.com
+ +S:    Supported
+ +F:    arch/arm/mach-shmobile/
+ +F:    drivers/sh/
+ +
   ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
   M:    Lennert Buytenhek <kernel@wantstofly.org>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -971,12 -860,6 +971,12 @@@ L:       linux-arm-kernel@lists.infradead.or
   W:    http://www.mcuos.com
   S:    Maintained
   
+ +ARM/U8500 ARM ARCHITECTURE
+ +M:    Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +S:    Maintained
+ +F:    arch/arm/mach-ux500/
+ +
   ARM/VFP SUPPORT
   M:    Russell King <linux@arm.linux.org.uk>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -984,20 -867,13 +984,20 @@@ W:      http://www.arm.linux.org.uk
   S:    Maintained
   F:    arch/arm/vfp/
   
+ +ASC7621 HARDWARE MONITOR DRIVER
+ +M:    George Joseph <george.joseph@fairview5.com>
+ +L:    lm-sensors@lm-sensors.org
+ +S:    Maintained
+ +F:    Documentation/hwmon/asc7621
+ +F:    drivers/hwmon/asc7621.c
+ +
   ASUS ACPI EXTRAS DRIVER
   M:    Corentin Chary <corentincj@iksaif.net>
   M:    Karol Kozimor <sziwan@users.sourceforge.net>
   L:    acpi4asus-user@lists.sourceforge.net
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://acpi4asus.sf.net
   S:    Maintained
- -F:    arch/x86/kernel/acpi/boot.c
   F:    drivers/platform/x86/asus_acpi.c
   
   ASUS ASB100 HARDWARE MONITOR DRIVER
@@@ -1009,13 -885,13 +1009,13 @@@ F:    drivers/hwmon/asb100.
   ASUS LAPTOP EXTRAS DRIVER
   M:    Corentin Chary <corentincj@iksaif.net>
   L:    acpi4asus-user@lists.sourceforge.net
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://acpi4asus.sf.net
   S:    Maintained
   F:    drivers/platform/x86/asus-laptop.c
   
   ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
   M:    Dan Williams <dan.j.williams@intel.com>
- -M:    Maciej Sosnowski <maciej.sosnowski@intel.com>
   W:    http://sourceforge.net/projects/xscaleiop
   S:    Supported
   F:    Documentation/crypto/async-tx-api.txt
@@@ -1091,7 -967,7 +1091,7 @@@ F:       drivers/net/atlx
   
   ATM
   M:    Chas Williams <chas@cmf.nrl.navy.mil>
- -L:    linux-atm-general@lists.sourceforge.net (subscribers-only)
+ +L:    linux-atm-general@lists.sourceforge.net (moderated for non-subscribers)
   L:    netdev@vger.kernel.org
   W:    http://linux-atm.sourceforge.net
   S:    Maintained
@@@ -1119,7 -995,7 +1119,7 @@@ F:       drivers/serial/atmel_serial.
   
   ATMEL LCDFB DRIVER
   M:    Nicolas Ferre <nicolas.ferre@atmel.com>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/atmel_lcdfb.c
   F:    include/video/atmel_lcdc.h
@@@ -1190,6 -1066,7 +1190,6 @@@ F:      include/net/ax25.
   F:    net/ax25/
   
   B43 WIRELESS DRIVER
- -M:    Michael Buesch <mb@bu3sch.de>
   M:    Stefano Brivio <stefano.brivio@polimi.it>
   L:    linux-wireless@vger.kernel.org
   W:    http://linuxwireless.org/en/users/Drivers/b43
@@@ -1251,13 -1128,6 +1251,13 @@@ W:    http://blackfin.uclinux.or
   S:    Supported
   F:    drivers/rtc/rtc-bfin.c
   
+ +BLACKFIN SDH DRIVER
+ +M:    Cliff Cai <cliff.cai@analog.com>
+ +L:    uclinux-dist-devel@blackfin.uclinux.org
+ +W:    http://blackfin.uclinux.org
+ +S:    Supported
+ +F:    drivers/mmc/host/bfin_sdh.c
+ +
   BLACKFIN SERIAL DRIVER
   M:    Sonic Zhang <sonic.zhang@analog.com>
   L:    uclinux-dist-devel@blackfin.uclinux.org
@@@ -1341,12 -1211,6 +1341,12 @@@ L:    netdev@vger.kernel.or
   S:    Supported
   F:    drivers/net/tg3.*
   
+ +BROCADE BFA FC SCSI DRIVER
+ +M:    Jing Huang <huangj@brocade.com>
+ +L:    linux-scsi@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/scsi/bfa/
+ +
   BSG (block layer generic sg v4 driver)
   M:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
   L:    linux-scsi@vger.kernel.org
@@@ -1364,7 -1228,6 +1364,7 @@@ BTRFS FILE SYSTE
   M:    Chris Mason <chris.mason@oracle.com>
   L:    linux-btrfs@vger.kernel.org
   W:    http://btrfs.wiki.kernel.org/
+ +Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
   S:    Maintained
   F:    Documentation/filesystems/btrfs.txt
@@@ -1405,30 -1268,20 +1405,30 @@@ F:   arch/x86/include/asm/calgary.
   F:    arch/x86/include/asm/tce.h
   
   CAN NETWORK LAYER
- -M:    Urs Thuermann <urs.thuermann@volkswagen.de>
+ +M:    Oliver Hartkopp <socketcan@hartkopp.net>
   M:    Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
- -L:    socketcan-core@lists.berlios.de (subscribers-only)
+ +M:    Urs Thuermann <urs.thuermann@volkswagen.de>
+ +L:    socketcan-core@lists.berlios.de
+ +L:    netdev@vger.kernel.org
   W:    http://developer.berlios.de/projects/socketcan/
   S:    Maintained
- -F:    drivers/net/can/
- -F:    include/linux/can/
+ +F:    net/can/
   F:    include/linux/can.h
+ +F:    include/linux/can/core.h
+ +F:    include/linux/can/bcm.h
+ +F:    include/linux/can/raw.h
   
   CAN NETWORK DRIVERS
   M:    Wolfgang Grandegger <wg@grandegger.com>
- -L:    socketcan-core@lists.berlios.de (subscribers-only)
+ +L:    socketcan-core@lists.berlios.de
+ +L:    netdev@vger.kernel.org
   W:    http://developer.berlios.de/projects/socketcan/
   S:    Maintained
+ +F:    drivers/net/can/
+ +F:    include/linux/can/dev.h
+ +F:    include/linux/can/error.h
+ +F:    include/linux/can/netlink.h
+ +F:    include/linux/can/platform/
   
   CELL BROADBAND ENGINE ARCHITECTURE
   M:    Arnd Bergmann <arnd@arndb.de>
@@@ -1441,14 -1294,21 +1441,23 @@@ F:   arch/powerpc/include/asm/spu*.
   F:    arch/powerpc/oprofile/*cell*
   F:    arch/powerpc/platforms/cell/
   
+ CEPH DISTRIBUTED FILE SYSTEM CLIENT
+ M:    Sage Weil <sage@newdream.net>
+ L:    ceph-devel@lists.sourceforge.net
+ 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
   S:    Supported
   F:    Documentation/usb/WUSB-Design-overview.txt
   F:    Documentation/usb/wusb-cbaf
+ +F:    drivers/usb/host/hwa-hc.c
+ +F:    drivers/usb/host/whci/
   F:    drivers/usb/wusbcore/
   F:    include/linux/usb/wusb*
   
@@@ -1517,13 -1377,6 +1526,13 @@@ L:    linux-scsi@vger.kernel.or
   S:    Supported
   F:    drivers/scsi/fnic/
   
+ +CMPC ACPI DRIVER
+ +M:    Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
+ +M:    Daniel Oliveira Nascimento <don@syst.com.br>
+ +L:    platform-driver-x86@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/platform/x86/classmate-laptop.c
+ +
   CODA FILE SYSTEM
   M:    Jan Harkes <jaharkes@cs.cmu.edu>
   M:    coda@cs.cmu.edu
@@@ -1536,10 -1389,9 +1545,10 @@@ F:    include/linux/coda*.
   
   COMMON INTERNET FILE SYSTEM (CIFS)
   M:    Steve French <sfrench@samba.org>
- -L:    linux-cifs-client@lists.samba.org
- -L:    samba-technical@lists.samba.org
+ +L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
+ +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/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
   S:    Supported
   F:    Documentation/filesystems/cifs.txt
@@@ -1565,7 -1417,6 +1574,7 @@@ F:      drivers/pci/hotplug/cpcihp_generic.
   
   COMPAL LAPTOP SUPPORT
   M:    Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
+ +L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
   F:    drivers/platform/x86/compal-laptop.c
   
@@@ -1606,7 -1457,6 +1615,7 @@@ F:      mm/*cgroup
   
   CORETEMP HARDWARE MONITORING DRIVER
   M:    Rudolf Marek <r.marek@assembler.cz>
+ +M:    Huaxu Wan <huaxu.wan@intel.com>
   L:    lm-sensors@lm-sensors.org
   S:    Maintained
   F:    Documentation/hwmon/coretemp
@@@ -1686,8 -1536,9 +1695,8 @@@ S:      Maintaine
   F:    sound/pci/cs5535audio/
   
   CX18 VIDEO4LINUX DRIVER
- -M:    Hans Verkuil <hverkuil@xs4all.nl>
   M:    Andy Walls <awalls@radix.net>
- -L:    ivtv-devel@ivtvdriver.org
+ +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
   W:    http://linuxtv.org
@@@ -1783,9 -1634,10 +1792,9 @@@ F:     include/linux/tfrc.
   F:    net/dccp/
   
   DECnet NETWORK LAYER
- -M:    Christine Caulfield <christine.caulfield@googlemail.com>
   W:    http://linux-decnet.sourceforge.net
   L:    linux-decnet-user@lists.sourceforge.net
- -S:    Maintained
+ +S:    Orphan
   F:    Documentation/networking/decnet.txt
   F:    net/decnet/
   
@@@ -1796,7 -1648,6 +1805,7 @@@ F:      drivers/net/defxx.
   
   DELL LAPTOP DRIVER
   M:    Matthew Garrett <mjg59@srcf.ucam.org>
+ +L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
   F:    drivers/platform/x86/dell-laptop.c
   
@@@ -1826,7 -1677,6 +1835,7 @@@ DEVICE-MAPPER  (LVM
   P:    Alasdair Kergon
   L:    dm-devel@redhat.com
   W:    http://sources.redhat.com/dm
+ +Q:    http://patchwork.kernel.org/project/dm-devel/list/
   S:    Maintained
   F:    Documentation/device-mapper/
   F:    drivers/md/dm*
@@@ -1873,6 -1723,7 +1882,6 @@@ S:      Supporte
   F:    fs/dlm/
   
   DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
- -M:    Maciej Sosnowski <maciej.sosnowski@intel.com>
   M:    Dan Williams <dan.j.williams@intel.com>
   S:    Supported
   F:    drivers/dma/
@@@ -1916,19 -1767,6 +1925,19 @@@ S:    Maintaine
   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/
+ +
   DRIVER CORE, KOBJECTS, AND SYSFS
   M:    Greg Kroah-Hartman <gregkh@suse.de>
   T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
@@@ -2080,7 -1918,6 +2089,7 @@@ F:      drivers/edac/r82600_edac.
   EEEPC LAPTOP EXTRAS DRIVER
   M:    Corentin Chary <corentincj@iksaif.net>
   L:    acpi4asus-user@lists.sourceforge.net
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://acpi4asus.sf.net
   S:    Maintained
   F:    drivers/platform/x86/eeepc-laptop.c
@@@ -2140,7 -1977,6 +2149,7 @@@ F:      drivers/net/eexpress.
   ETHERNET BRIDGE
   M:    Stephen Hemminger <shemminger@linux-foundation.org>
   L:    bridge@lists.linux-foundation.org
+ +L:    netdev@vger.kernel.org
   W:    http://www.linux-foundation.org/en/Net:Bridge
   S:    Maintained
   F:    include/linux/netfilter_bridge/
@@@ -2172,7 -2008,6 +2181,7 @@@ M:      "Theodore Ts'o" <tytso@mit.edu
   M:    Andreas Dilger <adilger@sun.com>
   L:    linux-ext4@vger.kernel.org
   W:    http://ext4.wiki.kernel.org
+ +Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
   S:    Maintained
   F:    Documentation/filesystems/ext4.txt
   F:    fs/ext4/
@@@ -2196,17 -2031,6 +2205,17 @@@ S:    Supporte
   F:    Documentation/fault-injection/
   F:    lib/fault-inject.c
   
+ +FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
+ +M:    Robert Love <robert.w.love@intel.com>
+ +L:    devel@open-fcoe.org
+ +W:    www.Open-FCoE.org
+ +S:    Supported
+ +F:    drivers/scsi/libfc/
+ +F:    drivers/scsi/fcoe/
+ +F:    include/scsi/fc/
+ +F:    include/scsi/libfc.h
+ +F:    include/scsi/libfcoe.h
+ +
   FILE LOCKING (flock() and fcntl()/lockf())
   M:    Matthew Wilcox <matthew@wil.cx>
   L:    linux-fsdevel@vger.kernel.org
@@@ -2223,16 -2047,17 +2232,16 @@@ S:   Maintaine
   F:    fs/*
   
   FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
- -M:    Riku Voipio <riku.vipio@iki.fi>
+ +M:    Riku Voipio <riku.voipio@iki.fi>
   L:    lm-sensors@lm-sensors.org
   S:    Maintained
   F:    drivers/hwmon/f75375s.c
   F:    include/linux/f75375s.h
   
   FIREWIRE SUBSYSTEM
- -M:    Kristian Hoegsberg <krh@redhat.com>
   M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
   L:    linux1394-devel@lists.sourceforge.net
- -W:    http://www.linux1394.org/
+ +W:    http://ieee1394.wiki.kernel.org/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
   S:    Maintained
   F:    drivers/firewire/
@@@ -2258,7 -2083,7 +2267,7 @@@ F:      drivers/net/wan/dlci.
   F:    drivers/net/wan/sdla.c
   
   FRAMEBUFFER LAYER
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   W:    http://linux-fbdev.sourceforge.net/
   S:    Orphan
   F:    Documentation/fb/
@@@ -2281,7 -2106,7 +2290,7 @@@ F:      drivers/i2c/busses/i2c-cpm.
   
   FREESCALE IMX / MXC FRAMEBUFFER DRIVER
   M:    Sascha Hauer <kernel@pengutronix.de>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   S:    Maintained
   F:    arch/arm/plat-mxc/include/mach/imxfb.h
@@@ -2303,7 -2128,7 +2312,7 @@@ S:      Supporte
   F:    arch/powerpc/sysdev/qe_lib/
   F:    arch/powerpc/include/asm/*qe.h
   
- -FREESCALE USB PERIPHERIAL DRIVERS
+ +FREESCALE USB PERIPHERAL DRIVERS
   M:    Li Yang <leoli@freescale.com>
   L:    linux-usb@vger.kernel.org
   L:    linuxppc-dev@ozlabs.org
@@@ -2354,6 -2179,18 +2363,6 @@@ F:     Documentation/filesystems/caching
   F:    fs/fscache/
   F:    include/linux/fscache*.h
   
- -TRACING
- -M:    Steven Rostedt <rostedt@goodmis.org>
- -M:    Frederic Weisbecker <fweisbec@gmail.com>
- -M:    Ingo Molnar <mingo@redhat.com>
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
- -S:    Maintained
- -F:    Documentation/trace/ftrace.txt
- -F:    arch/*/*/*/ftrace.h
- -F:    arch/*/kernel/ftrace.c
- -F:    include/*/ftrace.h include/trace/ include/linux/trace*.h
- -F:    kernel/trace/
- -
   FUJITSU FR-V (FRV) PORT
   M:    David Howells <dhowells@redhat.com>
   S:    Maintained
@@@ -2361,7 -2198,7 +2370,7 @@@ F:      arch/frv
   
   FUJITSU LAPTOP EXTRAS
   M:    Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
- -L:    linux-acpi@vger.kernel.org
+ +L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
   F:    drivers/platform/x86/fujitsu-laptop.c
   
@@@ -2412,8 -2249,9 +2421,8 @@@ S:      Maintaine
   F:    include/asm-generic
   
   GENERIC UIO DRIVER FOR PCI DEVICES
- -M:    Michael S. Tsirkin <mst@redhat.com>
+ +M:    "Michael S. Tsirkin" <mst@redhat.com>
   L:    kvm@vger.kernel.org
- -L:    linux-kernel@vger.kernel.org
   S:    Supported
   F:    drivers/uio/uio_pci_generic.c
   
@@@ -2438,12 -2276,6 +2447,12 @@@ F:    Documentation/isdn/README.gigase
   F:    drivers/isdn/gigaset/
   F:    include/linux/gigaset_dev.h
   
+ +GRETH 10/100/1G Ethernet MAC device driver
+ +M:    Kristoffer Glembo <kristoffer@gaisler.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/greth*
+ +
   HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
   M:    Frank Seidel <frank@f-seidel.de>
   L:    lm-sensors@lm-sensors.org
@@@ -2451,32 -2283,11 +2460,32 @@@ W:   http://www.kernel.org/pub/linux/kern
   S:    Maintained
   F:    drivers/hwmon/hdaps.c
   
+ +HWPOISON MEMORY FAILURE HANDLING
+ +M:    Andi Kleen <andi@firstfloor.org>
+ +L:    linux-mm@kvack.org
+ +L:    linux-kernel@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
+ +S:    Maintained
+ +F:    mm/memory-failure.c
+ +F:    mm/hwpoison-inject.c
+ +
   HYPERVISOR VIRTUAL CONSOLE DRIVER
   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>
+ +S:    Maintained
+ +F:    drivers/firmware/iscsi_ibft*
+ +
   GSPCA FINEPIX SUBDRIVER
   M:    Frank Zago <frank@zago.net>
   L:    linux-media@vger.kernel.org
@@@ -2484,13 -2295,6 +2493,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
   S:    Maintained
   F:    drivers/media/video/gspca/finepix.c
   
+ +GSPCA GL860 SUBDRIVER
+ +M:    Olivier Lorin <o.lorin@laposte.net>
+ +L:    linux-media@vger.kernel.org
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+ +S:    Maintained
+ +F:    drivers/media/video/gspca/gl860/
+ +
   GSPCA M5602 SUBDRIVER
   M:    Erik Andren <erik.andren@gmail.com>
   L:    linux-media@vger.kernel.org
@@@ -2531,9 -2335,7 +2540,9 @@@ HARDWARE MONITORIN
   L:    lm-sensors@lm-sensors.org
   W:    http://www.lm-sensors.org/
   S:    Orphan
+ +F:    Documentation/hwmon/
   F:    drivers/hwmon/
+ +F:    include/linux/hwmon*.h
   
   HARDWARE RANDOM NUMBER GENERATOR CORE
   M:    Matt Mackall <mpm@selenic.com>
@@@ -2549,6 -2351,13 +2558,6 @@@ L:     linux-parisc@vger.kernel.or
   S:    Maintained
   F:    sound/parisc/harmony.*
   
- -HAYES ESP SERIAL DRIVER
- -M:    "Andrew J. Robinson" <arobinso@nyx.net>
- -W:    http://www.nyx.net/~arobinso
- -S:    Maintained
- -F:    Documentation/serial/hayes-esp.txt
- -F:    drivers/char/esp.c
- -
   HEWLETT-PACKARD SMART2 RAID DRIVER
   M:    Chirag Kantharia <chirag.kantharia@hp.com>
   L:    iss_storagedev@hp.com
@@@ -2638,7 -2447,6 +2647,7 @@@ F:      drivers/net/wireless/hostap
   
   HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
   M:    Carlos Corbacho <carlos@strangeworlds.co.uk>
+ +L:    platform-driver-x86@vger.kernel.org
   S:    Odd Fixes
   F:    drivers/platform/x86/tc1100-wmi.c
   
@@@ -2708,7 -2516,8 +2717,7 @@@ S:      Maintaine
   F:    Documentation/i2c/
   F:    drivers/i2c/
   F:    include/linux/i2c.h
- -F:    include/linux/i2c-dev.h
- -F:    include/linux/i2c-id.h
+ +F:    include/linux/i2c-*.h
   
   I2C-TINY-USB DRIVER
   M:    Till Harbaum <till@harbaum.org>
@@@ -2757,7 -2566,6 +2766,7 @@@ F:      drivers/scsi/ips.
   IDE SUBSYSTEM
   M:    "David S. Miller" <davem@davemloft.net>
   L:    linux-ide@vger.kernel.org
+ +Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
   S:    Maintained
   F:    Documentation/ide/
@@@ -2778,14 -2586,21 +2787,14 @@@ S:   Supporte
   F:    drivers/idle/i7300_idle.c
   
   IEEE 1394 SUBSYSTEM
- -M:    Ben Collins <ben.collins@ubuntu.com>
   M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
   L:    linux1394-devel@lists.sourceforge.net
- -W:    http://www.linux1394.org/
+ +W:    http://ieee1394.wiki.kernel.org/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
- -S:    Maintained
+ +S:    Obsolete
+ +F:    Documentation/debugging-via-ohci1394.txt
   F:    drivers/ieee1394/
   
- -IEEE 1394 RAW I/O DRIVER
- -M:    Dan Dennedy <dan@dennedy.org>
- -M:    Stefan Richter <stefanr@s5r6.in-berlin.de>
- -L:    linux1394-devel@lists.sourceforge.net
- -S:    Maintained
- -F:    drivers/ieee1394/raw1394*
- -
   IEEE 802.15.4 SUBSYSTEM
   M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
   M:    Sergey Lapin <slapin@ossfans.org>
@@@ -2802,7 -2617,7 +2811,7 @@@ S:      Supporte
   F:    security/integrity/ima/
   
   IMS TWINTURBO FRAMEBUFFER DRIVER
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Orphan
   F:    drivers/video/imsttfb.c
   
@@@ -2812,7 -2627,6 +2821,7 @@@ M:      Sean Hefty <sean.hefty@intel.com
   M:    Hal Rosenstock <hal.rosenstock@gmail.com>
   L:    linux-rdma@vger.kernel.org
   W:    http://www.openib.org/
+ +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
   S:    Supported
   F:    Documentation/infiniband/
@@@ -2832,27 -2646,26 +2841,27 @@@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCH
   M:    Dmitry Torokhov <dmitry.torokhov@gmail.com>
   M:    Dmitry Torokhov <dtor@mail.ru>
   L:    linux-input@vger.kernel.org
+ +Q:    http://patchwork.kernel.org/project/linux-input/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
   S:    Maintained
   F:    drivers/input/
   
   INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
- -M:    Sylvain Meyer <sylvain.meyer@worldonline.fr>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +M:    Maik Broemme <mbroemme@plusserver.de>
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    Documentation/fb/intelfb.txt
   F:    drivers/video/intelfb/
   
   INTEL 810/815 FRAMEBUFFER DRIVER
   M:    Antonino Daplas <adaplas@gmail.com>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/i810/
   
   INTEL MENLOW THERMAL DRIVER
   M:    Sujith Thomas <sujith.thomas@intel.com>
- -L:    linux-acpi@vger.kernel.org
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://www.lesswatts.org/projects/acpi/
   S:    Supported
   F:    drivers/platform/x86/intel_menlow.c
@@@ -2864,7 -2677,7 +2873,7 @@@ F:      arch/x86/kernel/microcode_core.
   F:    arch/x86/kernel/microcode_intel.c
   
   INTEL I/OAT DMA DRIVER
- -M:    Maciej Sosnowski <maciej.sosnowski@intel.com>
+ +M:    Dan Williams <dan.j.williams@intel.com>
   S:    Supported
   F:    drivers/dma/ioat*
   
@@@ -2878,7 -2691,7 +2887,7 @@@ F:      include/linux/intel-iommu.
   
   INTEL IOP-ADMA DMA DRIVER
   M:    Dan Williams <dan.j.williams@intel.com>
- -S:    Supported
+ +S:    Maintained
   F:    drivers/dma/iop-adma.c
   
   INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@@ -2902,11 -2715,10 +2911,11 @@@ L:   netdev@vger.kernel.or
   S:    Maintained
   F:    drivers/net/ixp2000/
   
- -INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
+ +INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)
   M:    Jeff Kirsher <jeffrey.t.kirsher@intel.com>
   M:    Jesse Brandeburg <jesse.brandeburg@intel.com>
   M:    Bruce Allan <bruce.w.allan@intel.com>
+ +M:    Alex Duyck <alexander.h.duyck@intel.com>
   M:    PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
   M:    John Ronciak <john.ronciak@intel.com>
   L:    e1000-devel@lists.sourceforge.net
@@@ -2916,7 -2728,6 +2925,7 @@@ F:      drivers/net/e100.
   F:    drivers/net/e1000/
   F:    drivers/net/e1000e/
   F:    drivers/net/igb/
+ +F:    drivers/net/igbvf/
   F:    drivers/net/ixgb/
   F:    drivers/net/ixgbe/
   
@@@ -2960,15 -2771,6 +2969,15 @@@ T:    git git://git.kernel.org/pub/scm/lin
   S:    Supported
   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
+ +W:    http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
+ +F:    drivers/net/wireless/iwmc3200wifi/
+ +
   IOC3 ETHERNET DRIVER
   M:    Ralf Baechle <ralf@linux-mips.org>
   L:    linux-mips@linux-mips.org
@@@ -3003,7 -2805,7 +3012,7 @@@ F:      drivers/infiniband/hw/ipath
   
   IPMI SUBSYSTEM
   M:    Corey Minyard <minyard@acm.org>
- -L:    openipmi-developer@lists.sourceforge.net
+ +L:    openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
   W:    http://openipmi.sourceforge.net/
   S:    Supported
   F:    Documentation/IPMI.txt
@@@ -3089,16 -2891,9 +3098,16 @@@ W:    http://www.melware.d
   S:    Maintained
   F:    drivers/isdn/hardware/eicon/
   
+ +IT87 HARDWARE MONITORING DRIVER
+ +M:    Jean Delvare <khali@linux-fr.org>
+ +L:    lm-sensors@lm-sensors.org
+ +S:    Maintained
+ +F:    Documentation/hwmon/it87
+ +F:    drivers/hwmon/it87.c
+ +
   IVTV VIDEO4LINUX DRIVER
- -M:    Hans Verkuil <hverkuil@xs4all.nl>
- -L:    ivtv-devel@ivtvdriver.org
+ +M:    Andy Walls <awalls@radix.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
   W:    http://www.ivtvdriver.org
@@@ -3149,7 -2944,6 +3158,7 @@@ F:      drivers/hwmon/k8temp.
   KCONFIG
   M:    Roman Zippel <zippel@linux-m68k.org>
   L:    linux-kbuild@vger.kernel.org
+ +Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
   S:    Maintained
   F:    Documentation/kbuild/kconfig-language.txt
   F:    scripts/kconfig/
@@@ -3175,9 -2969,9 +3184,9 @@@ S:      Maintaine
   F:    fs/autofs4/
   
   KERNEL BUILD
- -M:    Sam Ravnborg <sam@ravnborg.org>
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git
- -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
+ +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
   L:    linux-kbuild@vger.kernel.org
   S:    Maintained
   F:    Documentation/kbuild/
@@@ -3186,8 -2980,8 +3195,8 @@@ F:      scripts/Makefile.
   
   KERNEL JANITORS
   L:    kernel-janitors@vger.kernel.org
- -W:    http://www.kerneljanitors.org/
- -S:    Maintained
+ +W:    http://janitor.kernelnewbies.org/
+ +S:    Odd Fixes
   
   KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
   M:    "J. Bruce Fields" <bfields@fieldses.org>
@@@ -3221,10 -3015,11 +3230,10 @@@ L:   kvm@vger.kernel.or
   W:    http://kvm.qumranet.com
   S:    Supported
   F:    arch/x86/include/asm/svm.h
- -F:    arch/x86/kvm/kvm_svm.h
   F:    arch/x86/kvm/svm.c
   
   KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
- -M:    Hollis Blanchard <hollisb@us.ibm.com>
+ +M:    Alexander Graf <agraf@suse.de>
   L:    kvm-ppc@vger.kernel.org
   W:    http://kvm.qumranet.com
   S:    Supported
@@@ -3250,7 -3045,6 +3259,7 @@@ S:      Supporte
   F:    Documentation/s390/kvm.txt
   F:    arch/s390/include/asm/kvm*
   F:    arch/s390/kvm/
+ +F:    drivers/s390/kvm/
   
   KEXEC
   M:    Eric Biederman <ebiederm@xmission.com>
@@@ -3272,13 -3066,9 +3281,13 @@@ F:    kernel/kgdb.
   
   KMEMCHECK
   M:    Vegard Nossum <vegardno@ifi.uio.no>
- -P     Pekka Enberg
- -M:    penberg@cs.helsinki.fi
+ +M:    Pekka Enberg <penberg@cs.helsinki.fi>
   S:    Maintained
+ +F:    Documentation/kmemcheck.txt
+ +F:    arch/x86/include/asm/kmemcheck.h
+ +F:    arch/x86/mm/kmemcheck/
+ +F:    include/linux/kmemcheck.h
+ +F:    mm/kmemcheck.c
   
   KMEMLEAK
   M:    Catalin Marinas <catalin.marinas@arm.com>
@@@ -3356,34 -3146,26 +3365,34 @@@ LINUX FOR IBM pSERIES (RS/6000
   M:    Paul Mackerras <paulus@au.ibm.com>
   W:    http://www.ibm.com/linux/ltc/projects/ppc
   S:    Supported
+ +F:    arch/powerpc/boot/rs6000.h
   
   LINUX FOR POWERPC (32-BIT AND 64-BIT)
   M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
   M:    Paul Mackerras <paulus@samba.org>
   W:    http://www.penguinppc.org/
   L:    linuxppc-dev@ozlabs.org
+ +Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
   S:    Supported
+ +F:    Documentation/powerpc/
+ +F:    arch/powerpc/
   
   LINUX FOR POWER MACINTOSH
   M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
   W:    http://www.penguinppc.org/
   L:    linuxppc-dev@ozlabs.org
   S:    Maintained
+ +F:    arch/powerpc/platforms/powermac/
+ +F:    drivers/macintosh/
   
   LINUX FOR POWERPC EMBEDDED MPC5XXX
   M:    Grant Likely <grant.likely@secretlab.ca>
   L:    linuxppc-dev@ozlabs.org
   T:    git git://git.secretlab.ca/git/linux-2.6.git
   S:    Maintained
+ +F:    arch/powerpc/platforms/512x/
+ +F:    arch/powerpc/platforms/52xx/
   
   LINUX FOR POWERPC EMBEDDED PPC4XX
   M:    Josh Boyer <jwboyer@linux.vnet.ibm.com>
@@@ -3392,8 -3174,6 +3401,8 @@@ W:      http://www.penguinppc.org
   L:    linuxppc-dev@ozlabs.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
   S:    Maintained
+ +F:    arch/powerpc/platforms/40x/
+ +F:    arch/powerpc/platforms/44x/
   
   LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
   M:    Grant Likely <grant.likely@secretlab.ca>
@@@ -3401,8 -3181,6 +3410,8 @@@ W:      http://wiki.secretlab.ca/index.php/L
   L:    linuxppc-dev@ozlabs.org
   T:    git git://git.secretlab.ca/git/linux-2.6.git
   S:    Maintained
+ +F:    arch/powerpc/*/*virtex*
+ +F:    arch/powerpc/*/*/*virtex*
   
   LINUX FOR POWERPC EMBEDDED PPC8XX
   M:    Vitaly Bordug <vitb@kernel.crashing.org>
@@@ -3416,16 -3194,12 +3425,16 @@@ M:   Kumar Gala <galak@kernel.crashing.or
   W:    http://www.penguinppc.org/
   L:    linuxppc-dev@ozlabs.org
   S:    Maintained
+ +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
+ +F:    arch/powerpc/platforms/pasemi/
+ +F:    drivers/*/*pasemi*
+ +F:    drivers/*/*/*pasemi*
   
   LINUX SECURITY MODULE (LSM) FRAMEWORK
   M:    Chris Wright <chrisw@sous-sol.org>
@@@ -3446,12 -3220,6 +3455,12 @@@ S:    Maintaine
   F:    Documentation/hwmon/lis3lv02d
   F:    drivers/hwmon/lis3lv02d.*
   
+ +LM73 HARDWARE MONITOR DRIVER
+ +M:    Guillaume Ligneul <guillaume.ligneul@gmail.com>
+ +L:    lm-sensors@lm-sensors.org
+ +S:    Maintained
+ +F:    drivers/hwmon/lm73.c
+ +
   LM83 HARDWARE MONITOR DRIVER
   M:    Jean Delvare <khali@linux-fr.org>
   L:    lm-sensors@lm-sensors.org
@@@ -3484,13 -3252,6 +3493,13 @@@ S:    Maintaine
   F:    Documentation/ldm.txt
   F:    fs/partitions/ldm.*
   
+ +LogFS
+ +M:    Joern Engel <joern@logfs.org>
+ +L:    logfs@logfs.org
+ +W:    logfs.org
+ +S:    Maintained
+ +F:    fs/logfs/
+ +
   LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
   M:    Eric Moore <Eric.Moore@lsi.com>
   M:    support@lsi.com
@@@ -3507,10 -3268,8 +3516,10 @@@ S:    Maintaine
   F:    drivers/scsi/sym53c8xx_2/
   
   LTP (Linux Test Project)
- -M:    Subrata Modak <subrata@linux.vnet.ibm.com>
- -M:    Mike Frysinger <vapier@gentoo.org>
+ +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>
   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
@@@ -3586,16 -3345,16 +3595,16 @@@ S:   Maintaine
   F:    drivers/net/wireless/libertas/
   
   MARVELL MV643XX ETHERNET DRIVER
- -M:    Lennert Buytenhek <buytenh@marvell.com>
+ +M:    Lennert Buytenhek <buytenh@wantstofly.org>
   L:    netdev@vger.kernel.org
- -S:    Supported
+ +S:    Maintained
   F:    drivers/net/mv643xx_eth.*
   F:    include/linux/mv643xx.h
   
   MARVELL MWL8K WIRELESS DRIVER
- -M:    Lennert Buytenhek <buytenh@marvell.com>
+ +M:    Lennert Buytenhek <buytenh@wantstofly.org>
   L:    linux-wireless@vger.kernel.org
- -S:    Supported
+ +S:    Maintained
   F:    drivers/net/wireless/mwl8k.c
   
   MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
@@@ -3610,7 -3369,7 +3619,7 @@@ S:      Supporte
   
   MATROX FRAMEBUFFER DRIVER
   M:    Petr Vandrovec <vandrove@vc.cvut.cz>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/matrox/matroxfb_*
   F:    include/linux/matroxfb.h
@@@ -3627,7 -3386,6 +3636,7 @@@ M:      Mauro Carvalho Chehab <mchehab@infra
   P:    LinuxTV.org Project
   L:    linux-media@vger.kernel.org
   W:    http://linuxtv.org
+ +Q:    http://patchwork.kernel.org/project/linux-media/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
   S:    Maintained
   F:    Documentation/dvb/
@@@ -3655,7 -3413,7 +3664,7 @@@ F:      mm
   
   MEMORY RESOURCE CONTROLLER
   M:    Balbir Singh <balbir@linux.vnet.ibm.com>
- -M:    Pavel Emelyanov <xemul@openvz.org>
+ +M:    Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
   M:    KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
   L:    linux-mm@kvack.org
   S:    Maintained
@@@ -3663,9 -3421,8 +3672,9 @@@ F:      mm/memcontrol.
   
   MEMORY TECHNOLOGY DEVICES (MTD)
   M:    David Woodhouse <dwmw2@infradead.org>
- -W:    http://www.linux-mtd.infradead.org/
   L:    linux-mtd@lists.infradead.org
+ +W:    http://www.linux-mtd.infradead.org/
+ +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
   T:    git git://git.infradead.org/mtd-2.6.git
   S:    Maintained
   F:    drivers/mtd/
@@@ -3736,18 -3493,11 +3745,18 @@@ F:   drivers/char/mxser.
   
   MSI LAPTOP SUPPORT
   M:    Lennart Poettering <mzxreary@0pointer.de>
+ +L:    platform-driver-x86@vger.kernel.org
   W:    https://tango.0pointer.de/mailman/listinfo/s270-linux
   W:    http://0pointer.de/lennart/tchibo.html
   S:    Maintained
   F:    drivers/platform/x86/msi-laptop.c
   
+ +MSI WMI SUPPORT
+ +M:    Anisse Astier <anisse@astier.eu>
+ +L:    platform-driver-x86@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/platform/x86/msi-wmi.c
+ +
   MULTIFUNCTION DEVICES (MFD)
   M:    Samuel Ortiz <sameo@linux.intel.com>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
@@@ -3781,7 -3531,7 +3790,7 @@@ F:      include/linux/isicom.
   MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
   M:    Felipe Balbi <felipe.balbi@nokia.com>
   L:    linux-usb@vger.kernel.org
- -T:    git git://gitorious.org/musb/mainline.git
+ +T:    git git://gitorious.org/usb/usb.git
   S:    Maintained
   F:    drivers/usb/musb/
   
@@@ -3848,7 -3598,7 +3857,7 @@@ L:      netfilter@vger.kernel.or
   L:    coreteam@netfilter.org
   W:    http://www.netfilter.org/
   W:    http://www.iptables.org/
- -T:    git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
   S:    Supported
   F:    include/linux/netfilter*
   F:    include/linux/netfilter/
@@@ -3882,20 -3632,11 +3891,20 @@@ F:   Documentation/blockdev/nbd.tx
   F:    drivers/block/nbd.c
   F:    include/linux/nbd.h
   
+ +NETWORK DROP MONITOR
+ +M:    Neil Horman <nhorman@tuxdriver.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +W:    https://fedorahosted.org/dropwatch/
+ +F:    net/core/drop_monitor.c
+ +
   NETWORKING [GENERAL]
   M:    "David S. Miller" <davem@davemloft.net>
   L:    netdev@vger.kernel.org
   W:    http://www.linuxfoundation.org/en/Net
+ +W:    http://patchwork.ozlabs.org/project/netdev/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
   S:    Maintained
   F:    net/
   F:    include/net/
@@@ -3925,7 -3666,6 +3934,7 @@@ S:      Maintaine
   NETWORKING [WIRELESS]
   M:    "John W. Linville" <linville@tuxdriver.com>
   L:    linux-wireless@vger.kernel.org
+ +Q:    http://patchwork.kernel.org/project/linux-wireless/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
   S:    Maintained
   F:    net/mac80211/
@@@ -3939,16 -3679,15 +3948,16 @@@ NETWORKING DRIVER
   L:    netdev@vger.kernel.org
   W:    http://www.linuxfoundation.org/en/Net
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
   S:    Odd Fixes
   F:    drivers/net/
   F:    include/linux/if_*
   F:    include/linux/*device.h
   
   NETXEN (1/10) GbE SUPPORT
- -M:    Dhananjay Phadke <dhananjay@netxen.com>
+ +M:    Amit Kumar Salecha <amit.salecha@qlogic.com>
   L:    netdev@vger.kernel.org
- -W:    http://www.netxen.com
+ +W:    http://www.qlogic.com
   S:    Supported
   F:    drivers/net/netxen/
   
@@@ -3975,7 -3714,7 +3984,7 @@@ F:      drivers/net/ni5010.
   
   NILFS2 FILESYSTEM
   M:    KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
- -L:    users@nilfs.org
+ +L:    linux-nilfs@vger.kernel.org
   W:    http://www.nilfs.org/en/
   S:    Supported
   F:    Documentation/filesystems/nilfs2.txt
@@@ -4008,17 -3747,16 +4017,17 @@@ F:   fs/ntfs
   
   NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
   M:    Antonino Daplas <adaplas@gmail.com>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/riva/
   F:    drivers/video/nvidia/
   
   OMAP SUPPORT
- -M:    "Tony Lindgren <tony@atomide.com>" <tony@atomide.com>
+ +M:    Tony Lindgren <tony@atomide.com>
   L:    linux-omap@vger.kernel.org
   W:    http://www.muru.com/linux/omap/
   W:    http://linux.omap.com/
+ +Q:    http://patchwork.kernel.org/project/linux-omap/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
   S:    Maintained
   F:    arch/arm/*omap*/
@@@ -4043,20 -3781,12 +4052,20 @@@ S:   Maintaine
   F:    sound/soc/omap/
   
   OMAP FRAMEBUFFER SUPPORT
- -M:    Imre Deak <imre.deak@nokia.com>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ +L:    linux-fbdev@vger.kernel.org
   L:    linux-omap@vger.kernel.org
   S:    Maintained
   F:    drivers/video/omap/
   
+ +OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
+ +M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
+ +L:    linux-omap@vger.kernel.org
+ +L:    linux-fbdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/video/omap2/
+ +F:    Documentation/arm/OMAP/DSS
+ +
   OMAP MMC SUPPORT
   M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
   L:    linux-omap@vger.kernel.org
@@@ -4128,15 -3858,6 +4137,15 @@@ S:    Maintaine
   F:    Documentation/i2c/busses/i2c-ocores
   F:    drivers/i2c/busses/i2c-ocores.c
   
+ +OPEN FIRMWARE AND FLATTENED DEVICE TREE
+ +M:    Grant Likely <grant.likely@secretlab.ca>
+ +L:    devicetree-discuss@lists.ozlabs.org
+ +W:    http://fdt.secretlab.ca
+ +S:    Maintained
+ +F:    drivers/of
+ +F:    include/linux/of*.h
+ +K:    of_get_property
+ +
   OPROFILE
   M:    Robert Richter <robert.richter@amd.com>
   L:    oprofile-list@lists.sf.net
@@@ -4199,7 -3920,6 +4208,7 @@@ F:      drivers/i2c/busses/i2c-pasemi.
   
   PANASONIC LAPTOP ACPI EXTRAS DRIVER
   M:    Harald Welte <laforge@gnumonks.org>
+ +L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
   F:    drivers/platform/x86/panasonic-laptop.c
   
@@@ -4242,10 -3962,8 +4251,10 @@@ F:    drivers/block/paride
   PARISC ARCHITECTURE
   M:    Kyle McMartin <kyle@mcmartin.ca>
   M:    Helge Deller <deller@gmx.de>
+ +M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
   L:    linux-parisc@vger.kernel.org
   W:    http://www.parisc-linux.org/
+ +Q:    http://patchwork.kernel.org/project/linux-parisc/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
   S:    Maintained
   F:    arch/parisc/
@@@ -4288,7 -4006,6 +4297,7 @@@ F:      Documentation/powerpc/eeh-pci-error-
   PCI SUBSYSTEM
   M:    Jesse Barnes <jbarnes@virtuousgeek.org>
   L:    linux-pci@vger.kernel.org
+ +Q:    http://patchwork.kernel.org/project/linux-pci/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
   S:    Supported
   F:    Documentation/PCI/
@@@ -4327,17 -4044,7 +4336,17 @@@ PERFORMANCE EVENTS SUBSYSTE
   M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
   M:    Paul Mackerras <paulus@samba.org>
   M:    Ingo Molnar <mingo@elte.hu>
- -S:    Supported
+ +M:    Arnaldo Carvalho de Melo <acme@redhat.com>
+ +S:    Supported
+ +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/*/include/asm/perf_event.h
+ +F:    arch/*/lib/perf_event.c
+ +F:    arch/*/kernel/perf_callchain.c
+ +F:    tools/perf/
   
   PERSONALITY HANDLING
   M:    Christoph Hellwig <hch@infradead.org>
@@@ -4364,13 -4071,6 +4373,13 @@@ W:    http://www.pmc-sierra.com
   S:    Supported
   F:    drivers/scsi/pmcraid.*
   
+ +PMC SIERRA PM8001 DRIVER
+ +M:    jack_wang@usish.com
+ +M:    lindar_liu@usish.com
+ +L:    linux-scsi@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/scsi/pm8001/
+ +
   POSIX CLOCKS and TIMERS
   M:    Thomas Gleixner <tglx@linutronix.de>
   S:    Supported
@@@ -4530,13 -4230,6 +4539,13 @@@ L:    linux-arm-kernel@lists.infradead.or
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
   S:    Maintained
   
+ +MMP2 SUPPORT (aka ARMADA610)
+ +M:    Haojian Zhuang <haojian.zhuang@marvell.com>
+ +M:    Eric Miao <eric.y.miao@gmail.com>
+ +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+ +S:    Maintained
+ +
   PXA MMCI DRIVER
   S:    Orphan
   
@@@ -4561,13 -4254,6 +4570,13 @@@ S:    Supporte
   F:    Documentation/networking/LICENSE.qla3xxx
   F:    drivers/net/qla3xxx.*
   
+ +QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
+ +M:    Amit Kumar Salecha <amit.salecha@qlogic.com>
+ +M:    linux-driver@qlogic.com
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    drivers/net/qlcnic/
+ +
   QLOGIC QLGE 10Gb ETHERNET DRIVER
   M:    Ron Mercer <ron.mercer@qlogic.com>
   M:    linux-driver@qlogic.com
@@@ -4585,23 -4271,21 +4594,23 @@@ F:   include/linux/qnxtypes.
   
   RADEON FRAMEBUFFER DISPLAY DRIVER
   M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/aty/radeon*
   F:    include/linux/radeonfb.h
   
   RAGE128 FRAMEBUFFER DISPLAY DRIVER
   M:    Paul Mackerras <paulus@samba.org>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/aty/aty128fb.c
   
   RALINK RT2X00 WIRELESS LAN DRIVER
   P:    rt2x00 project
+ +M:    Ivo van Doorn <IvDoorn@gmail.com>
+ +M:    Gertjan van Wingerde <gwingerde@gmail.com>
   L:    linux-wireless@vger.kernel.org
- -L:    users@rt2x00.serialmonkey.com
+ +L:    users@rt2x00.serialmonkey.com (moderated for non-subscribers)
   W:    http://rt2x00.serialmonkey.com/
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
@@@ -4632,7 -4316,7 +4641,7 @@@ F:      drivers/net/wireless/ray
   RCUTORTURE MODULE
   M:    Josh Triplett <josh@freedesktop.org>
   M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
- -S:    Maintained
+ +S:    Supported
   F:    Documentation/RCU/torture.txt
   F:    kernel/rcutorture.c
   
@@@ -4657,12 -4341,11 +4666,12 @@@ M:   Dipankar Sarma <dipankar@in.ibm.com
   M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
   W:    http://www.rdrop.com/users/paulmck/rclock/
   S:    Supported
- -F:    Documentation/RCU/rcu.txt
- -F:    Documentation/RCU/rcuref.txt
- -F:    include/linux/rcupdate.h
- -F:    include/linux/srcu.h
- -F:    kernel/rcupdate.c
+ +F:    Documentation/RCU/
+ +F:    include/linux/rcu*
+ +F:    include/linux/srcu*
+ +F:    kernel/rcu*
+ +F:    kernel/srcu*
+ +X:    kernel/rcutorture.c
   
   REAL TIME CLOCK DRIVER
   M:    Paul Gortmaker <p_gortmaker@yahoo.com>
@@@ -4674,7 -4357,6 +4683,7 @@@ F:      include/linux/rtc.
   REAL TIME CLOCK (RTC) SUBSYSTEM
   M:    Alessandro Zummo <a.zummo@towertech.it>
   L:    rtc-linux@googlegroups.com
+ +Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
   S:    Maintained
   F:    Documentation/rtc.txt
   F:    drivers/rtc/
@@@ -4689,7 -4371,7 +4698,7 @@@ RFKIL
   M:    Johannes Berg <johannes@sipsolutions.net>
   L:    linux-wireless@vger.kernel.org
   S:    Maintained
- -F     Documentation/rfkill.txt
+ +F:    Documentation/rfkill.txt
   F:    net/rfkill/
   
   RISCOM8 DRIVER
@@@ -4733,7 -4415,7 +4742,7 @@@ F:      drivers/net/wireless/rtl818x/rtl8187
   
   S3 SAVAGE FRAMEBUFFER DRIVER
   M:    Antonino Daplas <adaplas@gmail.com>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/savage/
   
@@@ -4745,7 -4427,6 +4754,7 @@@ L:      linux-s390@vger.kernel.or
   W:    http://www.ibm.com/developerworks/linux/linux390/
   S:    Supported
   F:    arch/s390/
+ +F:    drivers/s390/
   
   S390 NETWORK DRIVERS
   M:    Ursula Braun <ursula.braun@de.ibm.com>
@@@ -4761,7 -4442,6 +4770,7 @@@ M:      Felix Beck <felix.beck@de.ibm.com
   M:    Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
   M:    linux390@de.ibm.com
   L:    linux-s390@vger.kernel.org
+ +W:    http://www.ibm.com/developerworks/linux/linux390/
   S:    Supported
   F:    drivers/s390/crypto/
   
@@@ -4801,13 -4481,6 +4810,13 @@@ F:    drivers/media/common/saa7146
   F:    drivers/media/video/*7146*
   F:    include/media/*7146*
   
+ +TLG2300 VIDEO4LINUX-2 DRIVER
+ +M:    Huang Shijie <shijie8@gmail.com>
+ +M:    Kang Yong <kangyong@telegent.com>
+ +M:    Zhang Xiaobing <xbzhang@telegent.com>
+ +S:    Supported
+ +F:    drivers/media/video/tlg2300
+ +
   SC1200 WDT DRIVER
   M:    Zwane Mwaikambo <zwane@arm.linux.org.uk>
   S:    Maintained
@@@ -4821,11 -4494,12 +4830,11 @@@ F:   kernel/sched
   F:    include/linux/sched.h
   
   SCORE ARCHITECTURE
- -P:    Chen Liqin
- -M:    liqin.chen@sunplusct.com
- -P:    Lennox Wu
- -M:    lennox.wu@gmail.com
+ +M:    Chen Liqin <liqin.chen@sunplusct.com>
+ +M:    Lennox Wu <lennox.wu@gmail.com>
   W:    http://www.sunplusct.com
   S:    Supported
+ +F:    arch/score/
   
   SCSI CDROM DRIVER
   M:    Jens Axboe <axboe@kernel.dk>
@@@ -4898,27 -4572,27 +4907,27 @@@ S:   Maintaine
   F:    drivers/mmc/host/sdricoh_cs.c
   
   SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
- -S:     Orphan
- -L:     linux-mmc@vger.kernel.org
- -F:     drivers/mmc/host/sdhci.*
+ +S:    Orphan
+ +L:    linux-mmc@vger.kernel.org
+ +F:    drivers/mmc/host/sdhci.*
   
   SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
   M:    Anton Vorontsov <avorontsov@ru.mvista.com>
   L:    linuxppc-dev@ozlabs.org
- -L:     linux-mmc@vger.kernel.org
+ +L:    linux-mmc@vger.kernel.org
   S:    Maintained
- -F:     drivers/mmc/host/sdhci-of.*
+ +F:    drivers/mmc/host/sdhci-of.*
   
   SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER
   M:    Ben Dooks <ben-linux@fluff.org>
- -L:     linux-mmc@vger.kernel.org
+ +L:    linux-mmc@vger.kernel.org
   S:    Maintained
   F:    drivers/mmc/host/sdhci-s3c.c
   
   SECURITY SUBSYSTEM
   M:    James Morris <jmorris@namei.org>
   L:    linux-security-module@vger.kernel.org (suggested Cc:)
- -T:    git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
   W:    http://security.wiki.kernel.org/
   S:    Supported
   F:    security/
@@@ -4953,18 -4627,9 +4962,18 @@@ F:    drivers/ata
   F:    include/linux/ata.h
   F:    include/linux/libata.h
   
+ +SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
+ +M:    Jayamohan Kallickal <jayamohank@serverengines.com>
+ +L:    linux-scsi@vger.kernel.org
+ +W:    http://www.serverengines.com
+ +S:    Supported
+ +F:    drivers/scsi/be2iscsi/
+ +
   SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
   M:    Sathya Perla <sathyap@serverengines.com>
   M:    Subbu Seetharaman <subbus@serverengines.com>
+ +M:    Sarveshwar Bandi <sarveshwarb@serverengines.com>
+ +M:    Ajit Khaparde <ajitk@serverengines.com>
   L:    netdev@vger.kernel.org
   W:    http://www.serverengines.com
   S:    Supported
@@@ -5015,7 -4680,8 +5024,7 @@@ F:      drivers/usb/gadget/lh7a40
   F:    drivers/usb/host/ohci-lh7a40*
   
   SIMPLE FIRMWARE INTERFACE (SFI)
- -P:    Len Brown
- -M:    lenb@kernel.org
+ +M:    Len Brown <lenb@kernel.org>
   L:    sfi-devel@simplefirmware.org
   W:    http://simplefirmware.org/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
@@@ -5042,7 -4708,6 +5051,7 @@@ F:      drivers/*/*/*s3c2410
   TI DAVINCI MACHINE SUPPORT
   P:    Kevin Hilman
   M:    davinci-linux-open-source@linux.davincidsp.com
+ +Q:    http://patchwork.kernel.org/project/linux-davinci/list/
   S:    Supported
   F:    arch/arm/mach-davinci
   
@@@ -5169,7 -4834,7 +5178,7 @@@ F:      include/linux/ssb
   
   SONY VAIO CONTROL DEVICE DRIVER
   M:    Mattia Dongili <malattia@linux.it>
- -L:    linux-acpi@vger.kernel.org
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
   S:    Maintained
   F:    Documentation/laptops/sony-laptop.txt
@@@ -5208,27 -4873,11 +5217,27 @@@ F:   include/sound/soc
   SPARC + UltraSPARC (sparc/sparc64)
   M:    "David S. Miller" <davem@davemloft.net>
   L:    sparclinux@vger.kernel.org
+ +Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
   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/
   
+ +SPARC SERIAL DRIVERS
+ +M:    "David S. Miller" <davem@davemloft.net>
+ +L:    sparclinux@vger.kernel.org
+ +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:    drivers/serial/suncore.c
+ +F:    drivers/serial/suncore.h
+ +F:    drivers/serial/sunhv.c
+ +F:    drivers/serial/sunsab.c
+ +F:    drivers/serial/sunsab.h
+ +F:    drivers/serial/sunsu.c
+ +F:    drivers/serial/sunzilog.c
+ +F:    drivers/serial/sunzilog.h
+ +
   SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
   M:    Roger Wolff <R.E.Wolff@BitWizard.nl>
   S:    Supported
@@@ -5237,9 -4886,7 +5246,9 @@@ F:      drivers/char/specialix
   
   SPI SUBSYSTEM
   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/
   S:    Maintained
   F:    Documentation/spi/
   F:    drivers/spi/
@@@ -5295,7 -4942,7 +5304,7 @@@ F:      drivers/net/starfire
   
   STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
   S:    Orphan
- -F:    drivers/net/wireless/strip.c
+ +F:    drivers/staging/strip/strip.c
   F:    include/linux/if_strip.h
   
   STRADIS MPEG-2 DECODER DRIVER
@@@ -5316,7 -4963,6 +5325,7 @@@ SUPER
   M:    Paul Mundt <lethal@linux-sh.org>
   L:    linux-sh@vger.kernel.org
   W:    http://www.linux-sh.org
+ +Q:    http://patchwork.kernel.org/project/linux-sh/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
   S:    Supported
   F:    Documentation/sh/
@@@ -5393,7 -5039,6 +5402,7 @@@ F:      arch/xtensa
   THINKPAD ACPI EXTRAS DRIVER
   M:    Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
   L:    ibm-acpi-devel@lists.sourceforge.net
+ +L:    platform-driver-x86@vger.kernel.org
   W:    http://ibm-acpi.sourceforge.net
   W:    http://thinkwiki.org/wiki/Ibm-acpi
   T:    git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
@@@ -5447,12 -5092,10 +5456,12 @@@ F:   security/tomoyo
   
   TOPSTAR LAPTOP EXTRAS DRIVER
   M:    Herton Ronaldo Krzesinski <herton@mandriva.com.br>
+ +L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
   F:    drivers/platform/x86/topstar-laptop.c
   
   TOSHIBA ACPI EXTRAS DRIVER
+ +L:    platform-driver-x86@vger.kernel.org
   S:    Orphan
   F:    drivers/platform/x86/toshiba_acpi.c
   
@@@ -5486,20 -5129,6 +5495,20 @@@ L:    tpmdd-devel@lists.sourceforge.net (m
   S:    Maintained
   F:    drivers/char/tpm/
   
+ +TRACING
+ +M:    Steven Rostedt <rostedt@goodmis.org>
+ +M:    Frederic Weisbecker <fweisbec@gmail.com>
+ +M:    Ingo Molnar <mingo@redhat.com>
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
+ +S:    Maintained
+ +F:    Documentation/trace/ftrace.txt
+ +F:    arch/*/*/*/ftrace.h
+ +F:    arch/*/kernel/ftrace.c
+ +F:    include/*/ftrace.h
+ +F:    include/linux/trace*.h
+ +F:    include/trace/
+ +F:    kernel/trace/
+ +
   TRIVIAL PATCHES
   M:    Jiri Kosina <trivial@kernel.org>
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
@@@ -5543,7 -5172,7 +5552,7 @@@ S:      Maintaine
   F:    drivers/scsi/u14-34f.c
   
   UBI FILE SYSTEM (UBIFS)
- -M:    Artem Bityutskiy <dedekind@infradead.org>
+ +M:    Artem Bityutskiy <dedekind1@gmail.com>
   M:    Adrian Hunter <adrian.hunter@nokia.com>
   L:    linux-mtd@lists.infradead.org
   T:    git git://git.infradead.org/ubifs-2.6.git
@@@ -5581,19 -5210,10 +5590,19 @@@ ULTRA-WIDEBAND (UWB) SUBSYSTEM
   M:    David Vrabel <david.vrabel@csr.com>
   L:    linux-usb@vger.kernel.org
   S:    Supported
- -F:    drivers/uwb/*
+ +F:    drivers/uwb/
+ +X:    drivers/uwb/wlp/
+ +X:    drivers/uwb/i1480/i1480u-wlp/
+ +X:    drivers/uwb/i1480/i1480-wlp.h
   F:    include/linux/uwb.h
   F:    include/linux/uwb/
   
+ +UNIFDEF
+ +M:    Tony Finch <dot@dotat.at>
+ +W:    http://dotat.at/prog/unifdef
+ +S:    Maintained
+ +F:    scripts/unifdef.c
+ +
   UNIFORM CDROM DRIVER
   M:    Jens Axboe <axboe@kernel.dk>
   W:    http://www.kernel.dk
@@@ -5603,7 -5223,7 +5612,7 @@@ F:      drivers/cdrom/cdrom.
   F:    include/linux/cdrom.h
   
   UNSORTED BLOCK IMAGES (UBI)
- -M:    Artem Bityutskiy <dedekind@infradead.org>
+ +M:    Artem Bityutskiy <dedekind1@gmail.com>
   W:    http://www.linux-mtd.infradead.org/
   L:    linux-mtd@lists.infradead.org
   T:    git git://git.infradead.org/ubi-2.6.git
@@@ -5626,9 -5246,10 +5635,9 @@@ S:     Supporte
   F:    drivers/block/ub.c
   
   USB CDC ETHERNET DRIVER
- -M:    Greg Kroah-Hartman <greg@kroah.com>
+ +M:    Oliver Neukum <oliver@neukum.name>
   L:    linux-usb@vger.kernel.org
   S:    Maintained
- -W:    http://www.kroah.com/linux-usb/
   F:    drivers/net/usb/cdc_*.c
   F:    include/linux/usb/cdc.h
   
@@@ -5879,11 -5500,9 +5888,11 @@@ S:    Maintaine
   F:    drivers/net/wireless/rndis_wlan.c
   
   USB XHCI DRIVER
- -M:    Sarah Sharp <sarah.a.sharp@intel.com>
+ +M:    Sarah Sharp <sarah.a.sharp@linux.intel.com>
   L:    linux-usb@vger.kernel.org
   S:    Supported
+ +F:    drivers/usb/host/xhci*
+ +F:    drivers/usb/host/pci-quirks*
   
   USB ZC0301 DRIVER
   M:    Luca Risolia <luca.risolia@studio.unibo.it>
@@@ -5940,7 -5559,7 +5949,7 @@@ S:      Maintaine
   
   UVESAFB DRIVER
   M:    Michal Januszewski <spock@gentoo.org>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   W:    http://dev.gentoo.org/~spock/projects/uvesafb/
   S:    Maintained
   F:    Documentation/fb/uvesafb.txt
@@@ -5952,15 -5571,6 +5961,15 @@@ S:    Maintaine
   F:    Documentation/filesystems/vfat.txt
   F:    fs/fat/
   
+ +VIRTIO HOST (VHOST)
+ +M:    "Michael S. Tsirkin" <mst@redhat.com>
+ +L:    kvm@vger.kernel.org
+ +L:    virtualization@lists.osdl.org
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/vhost/
+ +F:    include/linux/vhost.h
+ +
   VIA RHINE NETWORK DRIVER
   M:    Roger Luethi <rl@hellgate.ch>
   S:    Maintained
@@@ -5982,7 -5592,7 +5991,7 @@@ F:      drivers/mmc/host/via-sdmmc.
   VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
   M:    Joseph Chan <JosephChan@via.com.tw>
   M:    Scott Fang <ScottFang@viatech.com.cn>
- -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
+ +L:    linux-fbdev@vger.kernel.org
   S:    Maintained
   F:    drivers/video/via/
   
@@@ -6007,21 -5617,6 +6016,21 @@@ S:    Maintaine
   F:    drivers/vlynq/vlynq.c
   F:    include/linux/vlynq.h
   
+ +VMWARE VMXNET3 ETHERNET DRIVER
+ +M:    Shreyas Bhatewara <sbhatewara@vmware.com>
+ +M:    "VMware, Inc." <pv-drivers@vmware.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/vmxnet3/
+ +
+ +VMware PVSCSI driver
+ +M:    Alok Kataria <akataria@vmware.com>
+ +M:    VMware PV-Drivers <pv-drivers@vmware.com>
+ +L:    linux-scsi@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/scsi/vmw_pvscsi.c
+ +F:    drivers/scsi/vmw_pvscsi.h
+ +
   VOLTAGE AND CURRENT REGULATOR FRAMEWORK
   M:    Liam Girdwood <lrg@slimlogic.co.uk>
   M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
@@@ -6084,7 -5679,7 +6093,7 @@@ L:      linux-wireless@vger.kernel.or
   W:    http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
   S:    Maintained
   F:    Documentation/networking/wavelan.txt
- -F:    drivers/net/wireless/wavelan*
+ +F:    drivers/staging/wavelan/
   
   WD7000 SCSI DRIVER
   M:    Miroslav Zagorac <zaga@fly.cc.fer.hr>
@@@ -6093,7 -5688,8 +6102,7 @@@ S:      Maintaine
   F:    drivers/scsi/wd7000.c
   
   WINBOND CIR DRIVER
- -P:    David Härdeman
- -M:    david@hardeman.nu
+ +M:    David Härdeman <david@hardeman.nu>
   S:    Maintained
   F:    drivers/input/misc/winbond-cir.c
   
@@@ -6106,12 -5702,9 +6115,12 @@@ W:    http://linuxwimax.or
   
   WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM
   M:    David Vrabel <david.vrabel@csr.com>
+ +L:    netdev@vger.kernel.org
   S:    Maintained
   F:    include/linux/wlp.h
   F:    drivers/uwb/wlp/
+ +F:    drivers/uwb/i1480/i1480u-wlp/
+ +F:    drivers/uwb/i1480/i1480-wlp.h
   
   WISTRON LAPTOP BUTTON DRIVER
   M:    Miloslav Trmac <mitr@volny.cz>
@@@ -6119,7 -5712,7 +6128,7 @@@ S:      Maintaine
   F:    drivers/input/misc/wistron_btns.c
   
   WL1251 WIRELESS DRIVER
- -M:    Kalle Valo <kalle.valo@nokia.com>
+ +M:    Kalle Valo <kalle.valo@iki.fi>
   L:    linux-wireless@vger.kernel.org
   W:    http://wireless.kernel.org
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
@@@ -6153,11 -5746,12 +6162,11 @@@ F:   drivers/input/touchscreen/*wm97
   F:    include/linux/wm97xx.h
   
   WOLFSON MICROELECTRONICS PMIC DRIVERS
- -P:    Mark Brown
- -M:    broonie@opensource.wolfsonmicro.com
- -L:    linux-kernel@vger.kernel.org
+ +M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
   T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
   W:    http://opensource.wolfsonmicro.com/node/8
   S:    Supported
+ +F:    Documentation/hwmon/wm83??
   F:    drivers/leds/leds-wm83*.c
   F:    drivers/mfd/wm8*.c
   F:    drivers/power/wm83*.c
@@@ -6167,14 -5761,14 +6176,14 @@@ F:   drivers/video/backlight/wm83*_bl.
   F:    drivers/watchdog/wm83*_wdt.c
   F:    include/linux/mfd/wm831x/
   F:    include/linux/mfd/wm8350/
- -F:    include/linux/mfd/wm8400/
- -F:    sound/soc/codecs/wm8350.c
- -F:    sound/soc/codecs/wm8400.c
+ +F:    include/linux/mfd/wm8400*
+ +F:    sound/soc/codecs/wm8350.*
+ +F:    sound/soc/codecs/wm8400.*
   
   X.25 NETWORK LAYER
- -M:    Henner Eisen <eis@baty.hanse.de>
+ +M:    Andrew Hendry <andrew.hendry@gmail.com>
   L:    linux-x25@vger.kernel.org
- -S:    Maintained
+ +S:    Odd Fixes
   F:    Documentation/networking/x25*
   F:    include/net/x25*
   F:    net/x25/
@@@ -6189,13 -5783,6 +6198,13 @@@ S:    Maintaine
   F:    Documentation/x86/
   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
+ +S:    Maintained
+ +F:    drivers/platform/x86
+ +
   XEN HYPERVISOR INTERFACE
   M:    Jeremy Fitzhardinge <jeremy@xensource.com>
   M:    Chris Wright <chrisw@sous-sol.org>
@@@ -6280,7 -5867,6 +6289,7 @@@ F:      drivers/serial/zs.
   THE REST
   M:    Linus Torvalds <torvalds@linux-foundation.org>
   L:    linux-kernel@vger.kernel.org
+ +Q:    http://patchwork.kernel.org/project/LKML/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
   S:    Buried alive in reporters
   F:    *
diff --combined fs/Kconfig

index 7405f07,ca68709..5f85b59
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -135,8 -135,8 +135,8 @@@ config TMPFS_POSIX_AC
   
   config HUGETLBFS
         bool "HugeTLB file system support"
- -      depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
- -                 (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN
+ +      depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
+ +                 SYS_SUPPORTS_HUGETLBFS || BROKEN
         help
           hugetlbfs is a filesystem backing for HugeTLB pages, based on
           ramfs. For architectures that support it, say Y here and read
@@@ -177,7 -177,6 +177,7 @@@ source "fs/efs/Kconfig
   source "fs/jffs2/Kconfig"
   # UBIFS File system configuration
   source "fs/ubifs/Kconfig"
+ +source "fs/logfs/Kconfig"
   source "fs/cramfs/Kconfig"
   source "fs/squashfs/Kconfig"
   source "fs/freevxfs/Kconfig"
@@@ -235,6 -234,7 +235,7 @@@ config NFS_COMMO
   
   source "net/sunrpc/Kconfig"
   source "fs/smbfs/Kconfig"
+ source "fs/ceph/Kconfig"
   source "fs/cifs/Kconfig"
   source "fs/ncpfs/Kconfig"
   source "fs/coda/Kconfig"
diff --combined fs/Makefile

index c3633aa,5ef73a0..97f340f
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -99,7 -99,6 +99,7 @@@ obj-$(CONFIG_NTFS_FS)         += ntfs
   obj-$(CONFIG_UFS_FS)          += ufs/
   obj-$(CONFIG_EFS_FS)          += efs/
   obj-$(CONFIG_JFFS2_FS)                += jffs2/
+ +obj-$(CONFIG_LOGFS)           += logfs/
   obj-$(CONFIG_UBIFS_FS)                += ubifs/
   obj-$(CONFIG_AFFS_FS)         += affs/
   obj-$(CONFIG_ROMFS_FS)                += romfs/
@@@ -125,3 -124,4 +125,4 @@@ obj-$(CONFIG_OCFS2_FS)             += ocfs2
   obj-$(CONFIG_BTRFS_FS)                += btrfs/
   obj-$(CONFIG_GFS2_FS)           += gfs2/
   obj-$(CONFIG_EXOFS_FS)          += exofs/
+ obj-$(CONFIG_CEPH_FS)         += ceph/
author	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 19 Mar 2010 16:43:06 +0000 (09:43 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 19 Mar 2010 16:43:06 +0000 (09:43 -0700)
		1	2
Documentation/ioctl/ioctl-number.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
fs/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history