maintainers: Fix PS3 patterns

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 641ffc1..e133ba4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -180,7 +180,7 @@ P:  Latchesar Ionkov
 M:     lucho@ionkov.net
 L:     v9fs-developer@lists.sourceforge.net
 W:     http://swik.net/v9fs
-T:     git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git
 S:     Maintained
 F:     Documentation/filesystems/9p.txt
 F:     fs/9p/
@@ -235,7 +235,7 @@ P:  Len Brown
 M:     lenb@kernel.org
 L:     linux-acpi@vger.kernel.org
 W:     http://www.lesswatts.org/projects/acpi/
-T:     git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:     Supported
 F:     drivers/acpi/
 F:     drivers/pnp/pnpacpi/
@@ -327,7 +327,7 @@ P:  Michael Wu
 M:     flamingice@sourmilk.net
 L:     linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
 S:     Maintained
 F:     drivers/net/wireless/adm8211.*
 
@@ -370,7 +370,7 @@ F:  net/rxrpc/af_rxrpc.c
 AGPGART DRIVER
 P:     David Airlie
 M:     airlied@linux.ie
-T:     git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:     Maintained
 F:     drivers/char/agp/
 F:     include/linux/agp*
@@ -454,14 +454,14 @@ AMD IOMMU (AMD-VI)
 P:     Joerg Roedel
 M:     joerg.roedel@amd.com
 L:     iommu@lists.linux-foundation.org
-T:     git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 S:     Supported
 F:     arch/x86/kernel/amd_iommu*.c
 F:     arch/x86/include/asm/amd_iommu*.h
 
 AMD MICROCODE UPDATE SUPPORT
 P:     Andreas Herrmann
-M:     andeas.herrmann3@amd.com
+M:     andreas.herrmann3@amd.com
 L:     amd64-microcode@amd64.org
 S:     Supported
 F:     arch/x86/kernel/microcode_amd.c
@@ -607,7 +607,7 @@ ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
 P:     Paulius Zaleckas
 M:     paulius.zaleckas@teltonika.lt
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-T:     git gitorious.org/linux-gemini/mainline.git
+T:     git git://gitorious.org/linux-gemini/mainline.git
 S:     Maintained
 
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
@@ -990,7 +990,7 @@ P:  Eric Paris
 M:     eparis@redhat.com
 L:     linux-audit@redhat.com (subscribers-only)
 W:     http://people.redhat.com/sgrubb/audit/
-T:     git git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
 S:     Maintained
 F:     include/linux/audit.h
 F:     kernel/audit*
@@ -1134,7 +1134,7 @@ BLOCK LAYER
 P:     Jens Axboe
 M:     axboe@kernel.dk
 L:     linux-kernel@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 S:     Maintained
 F:     block/
 
@@ -1158,7 +1158,7 @@ P:        Marcel Holtmann
 M:     marcel@holtmann.org
 L:     linux-bluetooth@vger.kernel.org
 W:     http://www.bluez.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
 S:     Maintained
 F:     net/bluetooth/
 F:     include/net/bluetooth/
@@ -1223,7 +1223,7 @@ P:        Chris Mason
 M:     chris.mason@oracle.com
 L:     linux-btrfs@vger.kernel.org
 W:     http://btrfs.wiki.kernel.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
 S:     Maintained
 F:     Documentation/filesystems/btrfs.txt
 F:     fs/btrfs/
@@ -1233,7 +1233,7 @@ P:        Mauro Carvalho Chehab
 M:     mchehab@infradead.org
 L:     linux-media@vger.kernel.org
 W:     http://linuxtv.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     Documentation/video4linux/bttv/
 F:     drivers/media/video/bt8xx/bttv*
@@ -1242,7 +1242,7 @@ CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
 P:     Jonathan Corbet
 M:     corbet@lwn.net
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     Documentation/video4linux/cafe_ccic
 F:     drivers/media/video/cafe_ccic*
@@ -1280,12 +1280,9 @@ L:       cbe-oss-dev@ozlabs.org
 W:     http://www.ibm.com/developerworks/power/cell/
 S:     Supported
 F:     arch/powerpc/include/asm/cell*.h
-F:     arch/powerpc/include/asm/lv1call.h
-F:     arch/powerpc/include/asm/ps3*.h
 F:     arch/powerpc/include/asm/spu*.h
 F:     arch/powerpc/oprofile/*cell*
 F:     arch/powerpc/platforms/cell/
-F:     arch/powerpc/platforms/ps3/
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 P:     David Vrabel
@@ -1362,7 +1359,6 @@ M:        timur@freescale.com
 L:     alsa-devel@alsa-project.org
 S:     Supported
 F:     sound/soc/codecs/cs4270*
-F:     sound/soc/fsl/mpc8610_hpcd.c
 
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:     Cirrus Logic Corporation (kernel 2.2 driver)
@@ -1390,7 +1386,7 @@ M:        sfrench@samba.org
 L:     linux-cifs-client@lists.samba.org
 L:     samba-technical@lists.samba.org
 W:     http://linux-cifs.samba.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:     Supported
 F:     Documentation/filesystems/cifs.txt
 F:     fs/cifs/
@@ -1479,7 +1475,7 @@ P:        Dave Jones
 M:     davej@redhat.com
 L:     cpufreq@vger.kernel.org
 W:     http://www.codemonkey.org.uk/projects/cpufreq/
-T:     git kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
 S:     Maintained
 F:     arch/x86/kernel/cpu/cpufreq/
 F:     drivers/cpufreq/
@@ -1525,7 +1521,7 @@ M:        herbert@gondor.apana.org.au
 P:     David S. Miller
 M:     davem@davemloft.net
 L:     linux-crypto@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
 S:     Maintained
 F:     Documentation/crypto/
 F:     arch/*/crypto/
@@ -1553,7 +1549,7 @@ M:        awalls@radix.net
 L:     ivtv-devel@ivtvdriver.org
 L:     ivtv-users@ivtvdriver.org
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://linuxtv.org
 S:     Maintained
 F:     Documentation/video4linux/cx18.txt
@@ -1582,12 +1578,6 @@ W:       http://www.arm.linux.org.uk/
 S:     Maintained
 F:     drivers/video/cyber2000fb.*
 
-CYBLAFB FRAMEBUFFER DRIVER
-P:     Knut Petersen
-M:     Knut_Petersen@t-online.de
-L:     linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
-S:     Maintained
-
 CYCLADES 2X SYNC CARD DRIVER
 P:     Arnaldo Carvalho de Melo
 M:     acme@ghostprotocols.net
@@ -1763,7 +1753,7 @@ P:        David Teigland
 M:     teigland@redhat.com
 L:     cluster-devel@redhat.com
 W:     http://sources.redhat.com/cluster/
-T:     git kernel.org:/pub/scm/linux/kernel/git/teigland/dlm.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
 S:     Supported
 F:     fs/dlm/
 
@@ -1828,7 +1818,7 @@ L:        linux-kernel@vger.kernel.org
 T:     quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:     Supported
 F:     Documentation/kobject.txt
-F:     drivers/base/core.c
+F:     drivers/base/
 F:     fs/sysfs/
 F:     include/linux/kobj*
 F:     lib/kobj*
@@ -1837,7 +1827,7 @@ DRM DRIVERS
 P:     David Airlie
 M:     airlied@linux.ie
 L:     dri-devel@lists.sourceforge.net
-T:     git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 S:     Maintained
 F:     drivers/gpu/drm/
 
@@ -1848,17 +1838,6 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wan/dscc4.c
 
-DVB SUBSYSTEM AND DRIVERS
-P:     LinuxTV.org Project
-M:     linux-media@vger.kernel.org
-W:     http://linuxtv.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-S:     Maintained
-F:     Documentation/dvb/
-F:     drivers/media/dvb/
-F:     drivers/media/common/saa7146*.c
-F:     include/linux/dvb/
-
 DZ DECSTATION DZ11 SERIAL DRIVER
 P:     Maciej W. Rozycki
 M:     macro@linux-mips.org
@@ -1912,7 +1891,7 @@ F:        fs/ecryptfs/
 EDAC-CORE
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Supported
 F:     Documentation/edac.txt
@@ -1924,7 +1903,7 @@ P:        Mark Gross
 P:     Doug Thompson
 M:     mark.gross@intel.com
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/e752x_edac.c
@@ -1932,7 +1911,7 @@ F:        drivers/edac/e752x_edac.c
 EDAC-E7XXX
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/e7xxx_edac.c
@@ -1940,7 +1919,7 @@ F:        drivers/edac/e7xxx_edac.c
 EDAC-I82443BXGX
 P:     Tim Small
 M:     tim@buttersideup.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82443bxgx_edac.c
@@ -1948,7 +1927,7 @@ F:        drivers/edac/i82443bxgx_edac.c
 EDAC-I3000
 P:     Jason Uhlenkott
 M:     juhlenko@akamai.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i3000_edac.c
@@ -1956,7 +1935,7 @@ F:        drivers/edac/i3000_edac.c
 EDAC-I5000
 P:     Doug Thompson
 M:     dougthompson@xmission.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5000_edac.c
@@ -1964,7 +1943,7 @@ F:        drivers/edac/i5000_edac.c
 EDAC-I5400
 P:     Mauro Carvalho Chehab
 M:     mchehab@redhat.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i5400_edac.c
@@ -1974,7 +1953,7 @@ P:        Ranganathan Desikan
 P:     Arvind R.
 M:     rdesikan@jetzbroadband.com
 M:     arvind@acarlab.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82975x_edac.c
@@ -1982,7 +1961,7 @@ F:        drivers/edac/i82975x_edac.c
 EDAC-PASEMI
 P:     Egor Martovetsky
 M:     egor@pasemi.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/pasemi_edac.c
@@ -1990,7 +1969,7 @@ F:        drivers/edac/pasemi_edac.c
 EDAC-R82600
 P:     Tim Small
 M:     tim@buttersideup.com
-L:     bluesmoke-devel@lists.sourceforge.net
+L:     bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/r82600_edac.c
@@ -2145,6 +2124,8 @@ P:        Riku Voipio
 M:     riku.vipio@iki.fi
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
+F:     drivers/hwmon/f75375s.c
+F:     include/linux/f75375s.h
 
 FIREWIRE SUBSYSTEM
 P:     Kristian Hoegsberg
@@ -2153,7 +2134,7 @@ P:        Stefan Richter
 M:     stefanr@s5r6.in-berlin.de
 L:     linux1394-devel@lists.sourceforge.net
 W:     http://www.linux1394.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 S:     Maintained
 F:     drivers/firewire/
 F:     include/linux/firewire*.h
@@ -2167,8 +2148,8 @@ F:        include/linux/firmware.h
 
 FPU EMULATOR
 P:     Bill Metzenthen
-M:     billm@suburbia.net
-W:     http://suburbia.net/~billm/floating-point/emulator/
+M:     billm@melbpc.org.au
+W:     http://floatingpoint.sourceforge.net/emulator/index.html
 S:     Maintained
 F:     arch/x86/math-emu/
 
@@ -2265,7 +2246,8 @@ M:        timur@freescale.com
 L:     alsa-devel@alsa-project.org
 L:     linuxppc-dev@ozlabs.org
 S:     Supported
-F:     sound/soc/fsl/
+F:     sound/soc/fsl/fsl*
+F:     sound/soc/fsl/mpc8610_hpcd.c
 
 FREEVXFS FILESYSTEM
 P:     Christoph Hellwig
@@ -2300,7 +2282,6 @@ P:        David Howells
 M:     dhowells@redhat.com
 S:     Maintained
 F:     arch/frv/
-F:     include/asm-frv/
 
 FUJITSU LAPTOP EXTRAS
 P:     Jonathan Woithe
@@ -2358,8 +2339,8 @@ P:        Steven Whitehouse
 M:     swhiteho@redhat.com
 L:     cluster-devel@redhat.com
 W:     http://sources.redhat.com/cluster/
-T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
-T:     git kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
 S:     Supported
 F:     Documentation/filesystems/gfs2*.txt
 F:     fs/gfs2/
@@ -2395,7 +2376,7 @@ GSPCA FINEPIX SUBDRIVER
 P:     Frank Zago
 M:     frank@zago.net
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     drivers/media/video/gspca/finepix.c
 
@@ -2403,7 +2384,7 @@ GSPCA M5602 SUBDRIVER
 P:     Erik Andren
 M:     erik.andren@gmail.com
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     drivers/media/video/gspca/m5602/
 
@@ -2411,7 +2392,7 @@ GSPCA PAC207 SONIXB SUBDRIVER
 P:     Hans de Goede
 M:     hdegoede@redhat.com
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     drivers/media/video/gspca/pac207.c
 
@@ -2419,7 +2400,7 @@ GSPCA T613 SUBDRIVER
 P:     Leandro Costantino
 M:     lcostantino@gmail.com
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     drivers/media/video/gspca/t613.c
 
@@ -2428,7 +2409,7 @@ P:        Jean-Francois Moine
 M:     moinejf@free.fr
 W:     http://moinejf.free.fr
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     drivers/media/video/gspca/
 
@@ -2460,12 +2441,6 @@ S:       Maintained
 F:     Documentation/serial/hayes-esp.txt
 F:     drivers/char/esp.c
 
-HEWLETT-PACKARD FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA
-P:     Chirag Kantharia
-M:     chirag.kantharia@hp.com
-L:     iss_storagedev@hp.com
-S:     Maintained
-
 HEWLETT-PACKARD SMART2 RAID DRIVER
 P:     Chirag Kantharia
 M:     chirag.kantharia@hp.com
@@ -2519,7 +2494,7 @@ HID CORE LAYER
 P:     Jiri Kosina
 M:     jkosina@suse.cz
 L:     linux-input@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 S:     Maintained
 F:     drivers/hid/
 F:     include/linux/hid*
@@ -2614,8 +2589,8 @@ S:        Maintained
 F:     fs/hpfs/
 
 HSO 3G MODEM DRIVER
-P:     Denis Joseph Barrow
-M:     d.barow@option.com
+P:     Jan Dumon
+M:     j.dumon@option.com
 W:     http://www.pharscape.org
 S:     Maintained
 F:     drivers/net/usb/hso.c
@@ -2659,7 +2634,7 @@ I2C-TINY-USB DRIVER
 P:     Till Harbaum
 M:     till@harbaum.org
 L:     linux-i2c@vger.kernel.org
-T:     http://www.harbaum.org/till/i2c_tiny_usb
+W:     http://www.harbaum.org/till/i2c_tiny_usb
 S:     Maintained
 F:     drivers/i2c/busses/i2c-tiny-usb.c
 
@@ -2673,7 +2648,7 @@ F:        arch/x86/boot/
 i386 SETUP CODE / CPU ERRATA WORKAROUNDS
 P:     H. Peter Anvin
 M:     hpa@zytor.com
-T:     git.kernel.org:/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git
 S:     Maintained
 
 IA64 (Itanium) PLATFORM
@@ -2681,7 +2656,7 @@ P:        Tony Luck
 M:     tony.luck@intel.com
 L:     linux-ia64@vger.kernel.org
 W:     http://www.ia64-linux.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 S:     Maintained
 F:     arch/ia64/
 
@@ -2738,7 +2713,7 @@ P:        Stefan Richter
 M:     stefanr@s5r6.in-berlin.de
 L:     linux1394-devel@lists.sourceforge.net
 W:     http://www.linux1394.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
 S:     Maintained
 F:     drivers/ieee1394/
 
@@ -2771,7 +2746,7 @@ P:        Hal Rosenstock
 M:     hal.rosenstock@gmail.com
 L:     general@lists.openfabrics.org (moderated for non-subscribers)
 W:     http://www.openib.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
 S:     Supported
 F:     Documentation/infiniband/
 F:     drivers/infiniband/
@@ -2793,7 +2768,7 @@ P:        Dmitry Torokhov
 M:     dmitry.torokhov@gmail.com
 M:     dtor@mail.ru
 L:     linux-input@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
 S:     Maintained
 F:     drivers/input/
 
@@ -2838,7 +2813,7 @@ INTEL IOMMU (VT-d)
 P:     David Woodhouse
 M:     dwmw2@infradead.org
 L:     iommu@lists.linux-foundation.org
-T:     git://git.infradead.org/iommu-2.6.git
+T:     git git://git.infradead.org/iommu-2.6.git
 S:     Supported
 F:     drivers/pci/intel-iommu.c
 F:     include/linux/intel-iommu.h
@@ -2944,7 +2919,7 @@ M:        reinette.chatre@intel.com
 L:     linux-wireless@vger.kernel.org
 L:     ipw3945-devel@lists.sourceforge.net
 W:     http://intellinuxwireless.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
 S:     Supported
 F:     drivers/net/wireless/iwlwifi/
 
@@ -3024,7 +2999,7 @@ M:        jkosina@suse.cz
 P:     David Sterba
 M:     dsterba@suse.cz
 S:     Maintained
-T:     git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
 F:     drivers/char/pcmcia/ipwireless/
 
 IPX NETWORK LAYER
@@ -3060,7 +3035,7 @@ P:        Mike Christie
 M:     michaelc@cs.wisc.edu
 L:     open-iscsi@googlegroups.com
 W:     www.open-iscsi.org
-T:     git kernel.org:/pub/scm/linux/kernel/mnc/linux-2.6-iscsi.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mnc/linux-2.6-iscsi.git
 S:     Maintained
 F:     drivers/scsi/*iscsi*
 F:     include/scsi/*iscsi*
@@ -3070,7 +3045,7 @@ P:        Karsten Keil
 M:     isdn@linux-pingi.de
 L:     isdn4linux@listserv.isdn4linux.de (subscribers-only)
 W:     http://www.isdn4linux.de
-T:     git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/isdn-2.6.git
 S:     Maintained
 F:     Documentation/isdn/
 F:     drivers/isdn/
@@ -3091,7 +3066,7 @@ M:        hverkuil@xs4all.nl
 L:     ivtv-devel@ivtvdriver.org
 L:     ivtv-users@ivtvdriver.org
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://www.ivtvdriver.org
 S:     Maintained
 F:     Documentation/video4linux/*.ivtv
@@ -3103,7 +3078,7 @@ P:        Dave Kleikamp
 M:     shaggy@austin.ibm.com
 L:     jfs-discussion@lists.sourceforge.net
 W:     http://jfs.sourceforge.net/
-T:     git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
 S:     Supported
 F:     Documentation/filesystems/jfs.txt
 F:     fs/jfs/
@@ -3161,7 +3136,7 @@ L:        kexec@lists.infradead.org
 L:     linux-kernel@vger.kernel.org
 W:     http://lse.sourceforge.net/kdump/
 S:     Maintained
-F:     Documentation/kdump
+F:     Documentation/kdump/
 
 KERNEL AUTOMOUNTER (AUTOFS)
 P:     H. Peter Anvin
@@ -3180,8 +3155,8 @@ F:        fs/autofs4/
 KERNEL BUILD
 P:     Sam Ravnborg
 M:     sam@ravnborg.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-next.git
-T:     git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
+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
 L:     linux-kbuild@vger.kernel.org
 S:     Maintained
 F:     Documentation/kbuild/
@@ -3262,7 +3237,7 @@ W:        http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     Documentation/s390/kvm.txt
 F:     arch/s390/include/asm/kvm*
-F:     arch/s390/kvm
+F:     arch/s390/kvm/
 
 KEXEC
 P:     Eric Biederman
@@ -3368,12 +3343,6 @@ M:       paulus@au.ibm.com
 W:     http://www.ibm.com/linux/ltc/projects/ppc
 S:     Supported
 
-LINUX FOR NCR VOYAGER
-P:     James Bottomley
-M:     James.Bottomley@HansenPartnership.com
-W:     http://www.hansenpartnership.com/voyager
-S:     Maintained
-
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 P:     Benjamin Herrenschmidt
 M:     benh@kernel.crashing.org
@@ -3381,7 +3350,7 @@ P:        Paul Mackerras
 M:     paulus@samba.org
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@ozlabs.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/benh/powerpc.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
 S:     Supported
 
 LINUX FOR POWER MACINTOSH
@@ -3406,7 +3375,7 @@ P:        Matt Porter
 M:     mporter@kernel.crashing.org
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@ozlabs.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc.git
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
@@ -3443,7 +3412,7 @@ LINUX SECURITY MODULE (LSM) FRAMEWORK
 P:     Chris Wright
 M:     chrisw@sous-sol.org
 L:     linux-security-module@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
 S:     Supported
 
 LLC (802.2)
@@ -3483,7 +3452,7 @@ M:        peterz@infradead.org
 P:     Ingo Molnar
 M:     mingo@redhat.com
 L:     linux-kernel@vger.kernel.org
-T:     git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
 S:     Maintained
 F:     Documentation/lockdep*.txt
 F:     Documentation/lockstat.txt
@@ -3523,7 +3492,7 @@ P:        Mike Frysinger
 M:     vapier@gentoo.org
 L:     ltp-list@lists.sourceforge.net (subscribers-only)
 W:     http://ltp.sourceforge.net/
-T:     git kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/galak/ltp.git
 S:     Maintained
 
 M32R ARCHITECTURE
@@ -3543,9 +3512,10 @@ P:       Roman Zippel
 M:     zippel@linux-m68k.org
 L:     linux-m68k@lists.linux-m68k.org
 W:     http://www.linux-m68k.org/
-T:     git git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
 S:     Maintained
 F:     arch/m68k/
+F:     drivers/zorro/
 
 M68K ON APPLE MACINTOSH
 P:     Joshua Thompson
@@ -3553,6 +3523,7 @@ M:        funaho@jurai.org
 W:     http://www.mac.linux-m68k.org/
 L:     linux-m68k@lists.linux-m68k.org
 S:     Maintained
+F:     arch/m68k/mac/
 
 M68K ON HP9000/300
 P:     Philip Blundell
@@ -3566,7 +3537,7 @@ P:        Johannes Berg
 M:     johannes@sipsolutions.net
 L:     linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:     Maintained
 F:     Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
@@ -3579,7 +3550,7 @@ P:        Mattias Nissler
 M:     mattias.nissler@gmx.de
 L:     linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
-T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:     Maintained
 F:     net/mac80211/rc80211_pid*
 
@@ -3643,6 +3614,21 @@ S:       Maintained
 F:     Documentation/hwmon/max6650
 F:     drivers/hwmon/max6650.c
 
+MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
+P:     Mauro Carvalho Chehab
+M:     mchehab@infradead.org
+P:     LinuxTV.org Project
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+S:     Maintained
+F:     Documentation/dvb/
+F:     Documentation/video4linux/
+F:     drivers/media/
+F:     include/media/
+F:     include/linux/dvb/
+F:     include/linux/videodev*.h
+
 MEGARAID SCSI DRIVERS
 P:     Neela Syam Kolli
 M:     megaraidlinux@lsi.com
@@ -3684,6 +3670,15 @@ F:       drivers/mtd/
 F:     include/linux/mtd/
 F:     include/mtd/
 
+MICROBLAZE ARCHITECTURE
+P:     Michal Simek
+M:     monstr@monstr.eu
+L:     microblaze-uclinux@itee.uq.edu.au
+W:     http://www.monstr.eu/fdt/
+T:     git git://git.monstr.eu/linux-2.6-microblaze.git
+S:     Supported
+F:     arch/microblaze/
+
 MICROTEK X6 SCANNER
 P:     Oliver Neukum
 M:     oliver@neukum.name
@@ -3695,7 +3690,7 @@ P:        Ralf Baechle
 M:     ralf@linux-mips.org
 W:     http://www.linux-mips.org/
 L:     linux-mips@linux-mips.org
-T:     git www.linux-mips.org:/pub/scm/linux.git
+T:     git git://git.linux-mips.org/pub/scm/linux.git
 S:     Supported
 F:     Documentation/mips/
 F:     arch/mips/
@@ -3762,7 +3757,7 @@ MULTIFUNCTION DEVICES (MFD)
 P:     Samuel Ortiz
 M:     sameo@linux.intel.com
 L:     linux-kernel@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
 S:     Supported
 F:     drivers/mfd/
 
@@ -3801,7 +3796,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
 P:     Felipe Balbi
 M:     felipe.balbi@nokia.com
 L:     linux-usb@vger.kernel.org
-T:     git gitorious.org:/musb/mainline.git
+T:     git git://gitorious.org/musb/mainline.git
 S:     Maintained
 F:     drivers/usb/musb/
 
@@ -3897,7 +3892,7 @@ M:        paul.moore@hp.com
 W:     http://netlabel.sf.net
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     Documentation/netlabel
+F:     Documentation/netlabel/
 F:     include/net/netlabel.h
 F:     net/netlabel/
 
@@ -3923,7 +3918,7 @@ NETWORK DEVICE DRIVERS
 P:     Jeff Garzik
 M:     jgarzik@pobox.com
 L:     netdev@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
 S:     Maintained
 F:     drivers/net/
 
@@ -3950,7 +3945,7 @@ M:        yoshfuji@linux-ipv6.org
 P:     Patrick McHardy
 M:     kaber@trash.net
 L:     netdev@vger.kernel.org
-T:     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-2.6.git
 S:     Maintained
 F:     net/ipv4/
 F:     net/ipv6/
@@ -3966,7 +3961,7 @@ NETWORKING [WIRELESS]
 P:     John W. Linville
 M:     linville@tuxdriver.com
 L:     linux-wireless@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:     Maintained
 F:     net/wireless/
 F:     include/net/ieee80211*
@@ -4038,7 +4033,7 @@ M:        aia21@cantab.net
 L:     linux-ntfs-dev@lists.sourceforge.net
 L:     linux-kernel@vger.kernel.org
 W:     http://www.linux-ntfs.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
 S:     Maintained
 F:     Documentation/filesystems/ntfs.txt
 F:     fs/ntfs/
@@ -4076,7 +4071,7 @@ OMNIVISION OV7670 SENSOR DRIVER
 P:     Jonathan Corbet
 M:     corbet@lwn.net
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     drivers/media/video/ov7670.c
 
@@ -4146,7 +4141,7 @@ P:        Benny Halevy
 M:     bhalevy@panasas.com
 L:     osd-dev@open-osd.org
 W:     http://open-osd.org
-T:     git://git.open-osd.org/open-osd.git
+T:     git git://git.open-osd.org/open-osd.git
 S:     Maintained
 
 P54 WIRELESS DRIVER
@@ -4154,7 +4149,7 @@ P:        Michael Wu
 M:     flamingice@sourmilk.net
 L:     linux-wireless@vger.kernel.org
 W:     http://prism54.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
 S:     Maintained
 F:     drivers/net/wireless/p54/
 
@@ -4188,7 +4183,6 @@ W:        ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 S:     Maintained
 F:     Documentation/mn10300/
 F:     arch/mn10300/
-F:     include/asm-mn10300/
 
 PARALLEL PORT SUPPORT
 L:     linux-parport@lists.infradead.org (subscribers-only)
@@ -4230,7 +4224,7 @@ P:        Helge Deller
 M:     deller@gmx.de
 L:     linux-parisc@vger.kernel.org
 W:     http://www.parisc-linux.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
 S:     Maintained
 F:     arch/parisc/
 F:     drivers/parisc/
@@ -4253,6 +4247,8 @@ PCA9532 LED DRIVER
 P:     Riku Voipio
 M:     riku.voipio@iki.fi
 S:     Maintained
+F:     drivers/leds/leds-pca9532.c
+F:     include/linux/leds-pca9532.h
 
 PCI ERROR RECOVERY
 P:     Linas Vepstas
@@ -4268,7 +4264,7 @@ P:        Jesse Barnes
 M:     jbarnes@virtuousgeek.org
 L:     linux-kernel@vger.kernel.org
 L:     linux-pci@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 S:     Supported
 F:     Documentation/PCI/
 F:     drivers/pci/
@@ -4285,7 +4281,7 @@ PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org
 W:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
-T:     git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 S:     Maintained
 F:     Documentation/pcmcia/
 F:     drivers/pcmcia/
@@ -4343,7 +4339,7 @@ M:        cbou@mail.ru
 P:     David Woodhouse
 M:     dwmw2@infradead.org
 L:     linux-kernel@vger.kernel.org
-T:     git git.infradead.org/battery-2.6.git
+T:     git git://git.infradead.org/battery-2.6.git
 S:     Maintained
 F:     include/linux/power_supply.h
 F:     drivers/power/power_supply*
@@ -4442,7 +4438,9 @@ F:        arch/powerpc/include/asm/ps3*.h
 F:     arch/powerpc/platforms/ps3/
 F:     drivers/*/ps3*
 F:     drivers/ps3/
+F:     drivers/rtc/rtc-ps3.c
 F:     drivers/usb/host/*ps3.c
+F:     sound/ppc/snd_ps3*
 
 PS3VRAM DRIVER
 P:     Jim Paris
@@ -4456,7 +4454,7 @@ M:        isely@pobox.com
 L:     pvrusb2@isely.net       (subscribers-only)
 L:     linux-media@vger.kernel.org
 W:     http://www.isely.net/pvrusb2/
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     Documentation/video4linux/README.pvrusb2
 F:     drivers/media/video/pvrusb2/
@@ -4481,14 +4479,14 @@ M:      eric.miao@marvell.com
 P:     Jason Chagas
 M:     jason.chagas@marvell.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-T:     git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 S:     Supported
 
 PXA910 SUPPORT
 P:     Eric Miao
 M:     eric.miao@marvell.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
-T:     git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 S:     Supported
 
 PXA MMCI DRIVER
@@ -4530,7 +4528,7 @@ M:        al@alarsen.net
 L:     linux-kernel@vger.kernel.org
 W:     http://www.alarsen.net/linux/qnx4fs/
 S:     Maintained
-F:     fs/qnx4
+F:     fs/qnx4/
 F:     include/linux/qnx4_fs.h
 F:     include/linux/qnxtypes.h
 
@@ -4555,7 +4553,7 @@ L:        linux-wireless@vger.kernel.org
 L:     users@rt2x00.serialmonkey.com
 W:     http://rt2x00.serialmonkey.com/
 S:     Maintained
-T:     git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
 F:     drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
@@ -4653,7 +4651,8 @@ P:        Ivo van Doorn
 M:     IvDoorn@gmail.com
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     net/rfkill
+F      Documentation/rfkill.txt
+F:     net/rfkill/
 
 RISCOM8 DRIVER
 S:     Orphan
@@ -4682,7 +4681,7 @@ P:        John W. Linville
 M:     linville@tuxdriver.com
 L:     linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtl818*
 
@@ -4695,7 +4694,7 @@ P:        Larry Finger
 M:     Larry.Finger@lwfinger.net
 L:     linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
-T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtl818x/rtl8187*
 
@@ -4736,6 +4735,7 @@ M:        ralph.wuerthner@de.ibm.com
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 S:     Supported
+F:     drivers/s390/crypto/
 
 S390 ZFCP DRIVER
 P:     Christof Schmitt
@@ -4772,7 +4772,7 @@ SAA7146 VIDEO4LINUX-2 DRIVER
 P:     Michael Hunold
 M:     michael@mihu.de
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://www.mihu.de/linux/saa7146
 S:     Maintained
 F:     drivers/media/common/saa7146*
@@ -4816,9 +4816,9 @@ SCSI SUBSYSTEM
 P:     James E.J. Bottomley
 M:     James.Bottomley@HansenPartnership.com
 L:     linux-scsi@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
-T:     git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
-T:     git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-pending-2.6.git
 S:     Maintained
 F:     drivers/scsi/
 F:     include/scsi/
@@ -4894,7 +4894,7 @@ P:        James Morris
 M:     jmorris@namei.org
 L:     linux-kernel@vger.kernel.org
 L:     linux-security-module@vger.kernel.org (suggested Cc:)
-T:     git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+T:     git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 W:     http://security.wiki.kernel.org/
 S:     Supported
 F:     security/
@@ -4914,7 +4914,7 @@ M:        eparis@parisplace.org
 L:     linux-kernel@vger.kernel.org (kernel issues)
 L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:     http://selinuxproject.org
-T:     git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 S:     Supported
 F:     include/linux/selinux*
 F:     security/selinux/
@@ -4930,8 +4930,11 @@ SERIAL ATA (SATA) SUBSYSTEM
 P:     Jeff Garzik
 M:     jgarzik@pobox.com
 L:     linux-ide@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
 S:     Supported
+F:     drivers/ata/
+F:     include/linux/ata.h
+F:     include/linux/libata.h
 
 SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
 P:     Sathya Perla
@@ -4975,8 +4978,8 @@ S:        Maintained for 2.6.
 F:     Documentation/sgi-visws.txt
 
 SGI XP/XPC/XPNET DRIVER
-P:     Dean Nelson
-M:     dcn@sgi.com
+P:     Robin Holt
+M:     holt@sgi.com
 S:     Maintained
 F:     drivers/misc/sgi-xp/
 
@@ -5124,7 +5127,7 @@ SOC-CAMERA V4L2 SUBSYSTEM
 P:     Guennadi Liakhovetski
 M:     g.liakhovetski@gmx.de
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
 F:     include/media/v4l2*
 F:     drivers/media/video/v4l2*
@@ -5191,7 +5194,7 @@ P:        Liam Girdwood
 M:     lrg@slimlogic.co.uk
 P:     Mark Brown
 M:     broonie@opensource.wolfsonmicro.com
-T:     git opensource.wolfsonmicro.com/linux-2.6-asoc
+T:     git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 L:     alsa-devel@alsa-project.org (subscribers-only)
 W:     http://alsa-project.org/main/index.php/ASoC
 S:     Supported
@@ -5201,8 +5204,8 @@ SPARC + UltraSPARC (sparc/sparc64)
 P:     David S. Miller
 M:     davem@davemloft.net
 L:     sparclinux@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
-T:     git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
+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/
 
@@ -5308,9 +5311,11 @@ P:       Paul Mundt
 M:     lethal@linux-sh.org
 L:     linux-sh@vger.kernel.org
 W:     http://www.linux-sh.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
 S:     Supported
+F:     Documentation/sh/
 F:     arch/sh/
+F:     drivers/sh/
 
 SUSPEND TO RAM
 P:     Len Brown
@@ -5400,7 +5405,7 @@ M:        ibm-acpi@hmh.eng.br
 L:     ibm-acpi-devel@lists.sourceforge.net
 W:     http://ibm-acpi.sourceforge.net
 W:     http://thinkwiki.org/wiki/Ibm-acpi
-T:     git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
+T:     git git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
 S:     Maintained
 F:     drivers/platform/x86/thinkpad_acpi.c
 
@@ -5436,7 +5441,7 @@ M:        allan.stephens@windriver.com
 L:     tipc-discussion@lists.sourceforge.net
 W:     http://tipc.sourceforge.net/
 W:     http://tipc.cslab.ericsson.net/
-T:     git tipc.cslab.ericsson.net:/pub/git/tipc.git
+T:     git git://tipc.cslab.ericsson.net/pub/git/tipc.git
 S:     Maintained
 F:     include/linux/tipc*.h
 F:     include/net/tipc/
@@ -5482,6 +5487,7 @@ TMIO MMC DRIVER
 P:     Ian Molton
 M:     ian@mnementh.co.uk
 S:     Maintained
+F:     drivers/mmc/host/tmio_mmc.*
 
 TPM DEVICE DRIVER
 P:     Debora Velarde
@@ -5500,7 +5506,7 @@ TRIVIAL PATCHES
 P:     Jiri Kosina
 M:     trivial@kernel.org
 L:     linux-kernel@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jikos/trivial.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:     Maintained
 
 TTY LAYER
@@ -5609,7 +5615,7 @@ W:        http://www.linux-mtd.infradead.org/
 L:     linux-mtd@lists.infradead.org
 T:     git git://git.infradead.org/ubi-2.6.git
 S:     Maintained
-F:     drivers/mtd/ubi
+F:     drivers/mtd/ubi/
 F:     include/linux/mtd/ubi.h
 F:     include/mtd/ubi-user.h
 
@@ -5674,7 +5680,7 @@ P:        Luca Risolia
 M:     luca.risolia@studio.unibo.it
 L:     linux-usb@vger.kernel.org
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://www.linux-projects.org
 S:     Maintained
 F:     drivers/media/video/et61x251/
@@ -5692,7 +5698,7 @@ USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
 P:     Jiri Kosina
 M:     jkosina@suse.cz
 L:     linux-usb@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
 S:     Maintained
 F:     Documentation/usb/hiddev.txt
 F:     drivers/hid/usbhid/
@@ -5854,7 +5860,7 @@ P:        Luca Risolia
 M:     luca.risolia@studio.unibo.it
 L:     linux-usb@vger.kernel.org
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://www.linux-projects.org
 S:     Maintained
 F:     Documentation/video4linux/sn9c102.txt
@@ -5894,7 +5900,7 @@ P:        Laurent Pinchart
 M:     laurent.pinchart@skynet.be
 L:     linux-uvc-devel@lists.berlios.de (subscribers-only)
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://linux-uvc.berlios.de
 S:     Maintained
 F:     drivers/media/video/uvc/
@@ -5904,7 +5910,7 @@ P:        Luca Risolia
 M:     luca.risolia@studio.unibo.it
 L:     linux-usb@vger.kernel.org
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://www.linux-projects.org
 S:     Maintained
 F:     Documentation/video4linux/w9968cf.txt
@@ -5922,7 +5928,7 @@ P:        Luca Risolia
 M:     luca.risolia@studio.unibo.it
 L:     linux-usb@vger.kernel.org
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://www.linux-projects.org
 S:     Maintained
 F:     Documentation/video4linux/zc0301.txt
@@ -5941,7 +5947,7 @@ P:        Antoine Jacquet
 M:     royale@zerezo.com
 L:     linux-usb@vger.kernel.org
 L:     linux-media@vger.kernel.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:     http://royale.zerezo.com/zr364xx/
 S:     Maintained
 F:     Documentation/video4linux/zr364xx.txt
@@ -5975,7 +5981,7 @@ P:        Karel Zak
 M:     kzak@redhat.com
 L:     util-linux-ng@vger.kernel.org
 W:     http://kernel.org/~kzak/util-linux-ng/
-T:     git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
+T:     git git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
 S:     Maintained
 
 UVESAFB DRIVER
@@ -6025,20 +6031,6 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/via-velocity.*
 
-VIDEO FOR LINUX (V4L)
-P:     Mauro Carvalho Chehab
-M:     mchehab@infradead.org
-L:     linux-media@vger.kernel.org
-W:     http://linuxtv.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
-S:     Maintained
-F:     Documentation/video4linux/
-F:     drivers/media/video/
-F:     drivers/media/radio/
-F:     include/linux/videodev.h
-F:     include/linux/videodev2.h
-F:     include/media/
-
 VLAN (802.1Q)
 P:     Patrick McHardy
 M:     kaber@trash.net
@@ -6055,7 +6047,7 @@ P:        Mark Brown
 M:     broonie@opensource.wolfsonmicro.com
 W:     http://opensource.wolfsonmicro.com/node/15
 W:     http://www.slimlogic.co.uk/?p=48
-T:     git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
 S:     Supported
 F:     drivers/regulator/
 F:     include/linux/regulator/
@@ -6108,7 +6100,7 @@ F:        drivers/mmc/host/wbsd.*
 WATCHDOG DEVICE DRIVERS
 P:     Wim Van Sebroeck
 M:     wim@iguana.be
-T:     git kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
 S:     Maintained
 F:     Documentation/watchdog/
 F:     drivers/watchdog/
@@ -6189,7 +6181,7 @@ P:        H. Peter Anvin
 M:     hpa@zytor.com
 M:     x86@kernel.org
 L:     linux-kernel@vger.kernel.org
-T:     git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
 S:     Maintained
 F:     Documentation/x86/
 F:     arch/x86/
@@ -6215,7 +6207,7 @@ M:        felixb@sgi.com
 M:     xfs-masters@oss.sgi.com
 L:     xfs@oss.sgi.com
 W:     http://oss.sgi.com/projects/xfs
-T:     git://oss.sgi.com/xfs/xfs.git
+T:     git git://oss.sgi.com/xfs/xfs.git
 S:     Supported
 F:     Documentation/filesystems/xfs.txt
 F:     fs/xfs/
@@ -6289,4 +6281,5 @@ F:        drivers/serial/zs.*
 
 THE REST
 P:     Linus Torvalds
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 S:     Buried alive in reporters