Merge branch 'origin' into devel-stable

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

1 files changed, 145 insertions, 30 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 776a5a46e351..bd8ac1ebc65b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -71,6 +71,7 @@ Descriptions of section entries:
         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.
@@ -182,6 +183,7 @@ M:	Ron Minnich <rminnich@sandia.gov>
 M:      Latchesar Ionkov <lucho@ionkov.net>
 L:      v9fs-developer@lists.sourceforge.net
 W:      http://swik.net/v9fs
+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
@@ -221,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
@@ -228,6 +231,7 @@ F:	drivers/platform/x86/acerhdf.c
 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
@@ -236,6 +240,7 @@ ACPI
 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/
@@ -288,7 +293,7 @@ F:	drivers/acpi/video.c
 
 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
@@ -426,7 +431,6 @@ P:	Jordan Crouse
 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/
@@ -980,10 +984,18 @@ 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:      drivers/platform/x86/asus_acpi.c
@@ -997,6 +1009,7 @@ F:	drivers/hwmon/asb100.c
 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
@@ -1344,6 +1357,7 @@ BTRFS FILE SYSTEM
 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
@@ -1489,6 +1503,7 @@ 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
 
@@ -1507,6 +1522,7 @@ M:	Steve French <sfrench@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
@@ -1532,6 +1548,7 @@ F:	drivers/pci/hotplug/cpcihp_generic.c
 
 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
 
@@ -1749,10 +1766,9 @@ F:	include/linux/tfrc.h
 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/
 
@@ -1763,6 +1779,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
 
@@ -1792,6 +1809,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*
@@ -2045,6 +2063,7 @@ F:	drivers/edac/r82600_edac.c
 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
@@ -2135,6 +2154,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/
@@ -2158,6 +2178,17 @@ S:	Supported
 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
@@ -2312,7 +2343,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
 
@@ -2389,6 +2420,12 @@ F:	Documentation/isdn/README.gigaset
 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
@@ -2410,6 +2447,18 @@ 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
@@ -2482,13 +2531,6 @@ L:	linux-parisc@vger.kernel.org
 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
@@ -2578,6 +2620,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
 
@@ -2696,6 +2739,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/
@@ -2750,6 +2794,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/
@@ -2769,6 +2814,7 @@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 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/
@@ -2788,7 +2834,7 @@ 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
@@ -3025,6 +3071,13 @@ W:	http://www.melware.de
 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:      Andy Walls <awalls@radix.net>
 L:      ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@ -3078,6 +3131,7 @@ F:	drivers/hwmon/k8temp.c
 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/
@@ -3152,7 +3206,7 @@ F:	arch/x86/include/asm/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
@@ -3291,6 +3345,7 @@ 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/
@@ -3411,6 +3466,13 @@ S:	Maintained
 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
@@ -3506,16 +3568,16 @@ S:	Maintained
 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
@@ -3547,6 +3609,7 @@ M:	Mauro Carvalho Chehab <mchehab@infradead.org>
 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/
@@ -3582,8 +3645,9 @@ F:	mm/memcontrol.c
 
 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/
@@ -3654,6 +3718,7 @@ 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
@@ -3661,6 +3726,7 @@ 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
 
@@ -3841,6 +3907,7 @@ S:	Maintained
 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/
@@ -3933,6 +4000,7 @@ 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*/
@@ -4113,6 +4181,7 @@ F:	drivers/i2c/busses/i2c-pasemi.c
 
 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
 
@@ -4158,6 +4227,7 @@ 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/
@@ -4200,6 +4270,7 @@ F:	Documentation/powerpc/eeh-pci-error-recovery.txt
 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/
@@ -4241,7 +4312,9 @@ M:	Ingo Molnar <mingo@elte.hu>
 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/*/kernel/*/*/perf_event.c
 F:      arch/*/include/asm/perf_event.h
 F:      arch/*/lib/perf_event.c
 F:      arch/*/kernel/perf_callchain.c
@@ -4469,6 +4542,13 @@ S:	Supported
 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
@@ -4533,7 +4613,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
 
@@ -4558,11 +4638,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>
@@ -4574,6 +4655,7 @@ F:	include/linux/rtc.h
 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/
@@ -4700,6 +4782,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
@@ -4855,6 +4944,8 @@ 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
@@ -4932,6 +5023,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
 
@@ -5058,7 +5150,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
@@ -5097,6 +5189,7 @@ 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
@@ -5112,6 +5205,7 @@ 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/
@@ -5167,7 +5261,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
@@ -5188,6 +5282,7 @@ SUPERH
 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/
@@ -5264,6 +5359,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
@@ -5317,10 +5413,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
 
@@ -5820,6 +5918,15 @@ S:	Maintained
 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
@@ -5943,7 +6050,7 @@ L:	linux-wireless@vger.kernel.org
 W:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
 S:      Maintained
 F:      Documentation/networking/wavelan.txt
-F:      drivers/net/wireless/wavelan*
+F:      drivers/staging/wavelan/
 
 WD7000 SCSI DRIVER
 M:      Miroslav Zagorac <zaga@fly.cc.fer.hr>
@@ -5978,7 +6085,7 @@ S:	Maintained
 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
@@ -6048,6 +6155,13 @@ S:	Maintained
 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>
@@ -6132,6 +6246,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:      *