1 files changed, 143 insertions, 90 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8afba6321e2..749f9cd3808 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -72,7 +72,7 @@ Descriptions of section entries:
         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.
+        T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit, topgit.
         S: Status, one of the following:
            Supported:   Someone is actually paid to look after this.
            Maintained:  Someone actually looks after it.
@@ -198,7 +198,7 @@ F:	Documentation/scsi/aacraid.txt
 F:      drivers/scsi/aacraid/
 
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
-M:      Hans de Goede <j.w.r.degoede@hhs.nl>
+M:      Hans de Goede <hdegoede@redhat.com>
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 F:      drivers/hwmon/abituguru.c
@@ -288,35 +288,35 @@ F:	sound/pci/ad1889.*
 AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/AD5254
+W:      http://wiki.analog.com/AD5254
 S:      Supported
 F:      drivers/misc/ad525x_dpot.c
 
 AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/AD5398
+W:      http://wiki.analog.com/AD5398
 S:      Supported
 F:      drivers/regulator/ad5398.c
 
 AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/AD7142
+W:      http://wiki.analog.com/AD7142
 S:      Supported
 F:      drivers/input/misc/ad714x.c
 
 AD7877 TOUCHSCREEN DRIVER
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/AD7877
+W:      http://wiki.analog.com/AD7877
 S:      Supported
 F:      drivers/input/touchscreen/ad7877.c
 
 AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/AD7879
+W:      http://wiki.analog.com/AD7879
 S:      Supported
 F:      drivers/input/touchscreen/ad7879.c
 
@@ -342,18 +342,18 @@ F:	drivers/net/wireless/adm8211.*
 ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/ADP5520
+W:      http://wiki.analog.com/ADP5520
 S:      Supported
 F:      drivers/mfd/adp5520.c
 F:      drivers/video/backlight/adp5520_bl.c
-F:      drivers/led/leds-adp5520.c
+F:      drivers/leds/leds-adp5520.c
 F:      drivers/gpio/adp5520-gpio.c
 F:      drivers/input/keyboard/adp5520-keys.c
 
 ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/ADP5588
+W:      http://wiki.analog.com/ADP5588
 S:      Supported
 F:      drivers/input/keyboard/adp5588-keys.c
 F:      drivers/gpio/adp5588-gpio.c
@@ -361,10 +361,18 @@ F:	drivers/gpio/adp5588-gpio.c
 ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/ADP8860
+W:      http://wiki.analog.com/ADP8860
 S:      Supported
 F:      drivers/video/backlight/adp8860_bl.c
 
+ADS1015 HARDWARE MONITOR DRIVER
+M:      Dirk Eibach <eibach@gdsys.de>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/ads1015
+F:      drivers/hwmon/ads1015.c
+F:      include/linux/i2c/ads1015.h
+
 ADT746X FAN DRIVER
 M:      Colin Leroy <colin@colino.net>
 S:      Maintained
@@ -380,7 +388,7 @@ F:	drivers/hwmon/adt7475.c
 ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
 M:      Michael Hennerich <michael.hennerich@analog.com>
 L:      device-driver-devel@blackfin.uclinux.org
-W:      http://wiki-analog.com/ADXL345
+W:      http://wiki.analog.com/ADXL345
 S:      Supported
 F:      drivers/input/misc/adxl34x.c
 
@@ -465,6 +473,16 @@ M:	Matt Turner <mattst88@gmail.com>
 L:      linux-alpha@vger.kernel.org
 F:      arch/alpha/
 
+ALTERA UART/JTAG UART SERIAL DRIVERS
+M:      Tobias Klauser <tklauser@distanz.ch>
+L:      linux-serial@vger.kernel.org
+L:      nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/tty/serial/altera_uart.c
+F:      drivers/tty/serial/altera_jtaguart.c
+F:      include/linux/altera_uart.h
+F:      include/linux/altera_jtaguart.h
+
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 M:      Thomas Dahlmann <dahlmann.thomas@arcor.de>
 L:      linux-geode@lists.infradead.org (moderated for non-subscribers)
@@ -510,11 +528,9 @@ F:	drivers/infiniband/hw/amso1100/
 ANALOG DEVICES INC ASOC CODEC DRIVERS
 L:      device-driver-devel@blackfin.uclinux.org
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
-W:      http://wiki-analog.com/
+W:      http://wiki.analog.com/
 S:      Supported
 F:      sound/soc/codecs/ad1*
-F:      sound/soc/codecs/adau*
-F:      sound/soc/codecs/adav*
 F:      sound/soc/codecs/ssm*
 
 ANALOG DEVICES INC ASOC DRIVERS
@@ -557,6 +573,13 @@ S:	Maintained
 F:      drivers/net/appletalk/
 F:      net/appletalk/
 
+ARASAN COMPACT FLASH PATA CONTROLLER
+M:      Viresh Kumar <viresh.kumar@st.com>
+L:      linux-ide@vger.kernel.org
+S:      Maintained
+F:      include/linux/pata_arasan_cf_data.h
+F:      drivers/ata/pata_arasan_cf.c
+
 ARC FRAMEBUFFER DRIVER
 M:      Jaya Kumar <jayalk@intworks.biz>
 S:      Maintained
@@ -672,8 +695,8 @@ S:	Maintained
 ARM/CLKDEV SUPPORT
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-F:      arch/arm/common/clkdev.c
 F:      arch/arm/include/asm/clkdev.h
+F:      drivers/clk/clkdev.c
 
 ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT
 M:      Mike Rapoport <mike@compulab.co.il>
@@ -894,6 +917,7 @@ F:	drivers/mmc/host/msm_sdcc.c
 F:      drivers/mmc/host/msm_sdcc.h
 F:      drivers/tty/serial/msm_serial.h
 F:      drivers/tty/serial/msm_serial.c
+F:      drivers/platform/msm/
 T:      git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
 S:      Maintained
 
@@ -1010,6 +1034,15 @@ L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-s5p*/
 
+ARM/SAMSUNG MOBILE MACHINE SUPPORT
+M:      Kyungmin Park <kyungmin.park@samsung.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/mach-s5pv210/mach-aquila.c
+F:      arch/arm/mach-s5pv210/mach-goni.c
+F:      arch/arm/mach-exynos4/mach-universal_c210.c
+F:      arch/arm/mach-exynos4/mach-nuri.c
+
 ARM/SAMSUNG S5P SERIES FIMC SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
 M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
@@ -1044,7 +1077,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
 ARM/TETON BGA MACHINE SUPPORT
-M:      Mark F. Brown <mark.brown314@gmail.com>
+M:      "Mark F. Brown" <mark.brown314@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
@@ -1205,7 +1238,7 @@ ATHEROS AR9170 WIRELESS DRIVER
 M:      Christian Lamparter <chunkeey@web.de>
 L:      linux-wireless@vger.kernel.org
 W:      http://wireless.kernel.org/en/users/Drivers/ar9170
-S:      Maintained
+S:      Obsolete
 F:      drivers/net/wireless/ath/ar9170/
 
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
@@ -1448,7 +1481,7 @@ F:	drivers/mtd/devices/block2mtd.c
 
 BLUETOOTH DRIVERS
 M:      Marcel Holtmann <marcel@holtmann.org>
-M:      Gustavo F. Padovan <padovan@profusion.mobi>
+M:      "Gustavo F. Padovan" <padovan@profusion.mobi>
 L:      linux-bluetooth@vger.kernel.org
 W:      http://www.bluez.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
@@ -1457,7 +1490,7 @@ F:	drivers/bluetooth/
 
 BLUETOOTH SUBSYSTEM
 M:      Marcel Holtmann <marcel@holtmann.org>
-M:      Gustavo F. Padovan <padovan@profusion.mobi>
+M:      "Gustavo F. Padovan" <padovan@profusion.mobi>
 L:      linux-bluetooth@vger.kernel.org
 W:      http://www.bluez.org/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
@@ -1467,6 +1500,7 @@ F:	include/net/bluetooth/
 
 BONDING DRIVER
 M:      Jay Vosburgh <fubar@us.ibm.com>
+M:      Andy Gospodarek <andy@greyhouse.net>
 L:      netdev@vger.kernel.org
 W:      http://sourceforge.net/projects/bonding/
 S:      Supported
@@ -1700,6 +1734,7 @@ S:	Maintained
 F:      Documentation/zh_CN/
 
 CISCO VIC ETHERNET NIC DRIVER
+M:      Christian Benvenuti <benve@cisco.com>
 M:      Vasanthy Kolluri <vkolluri@cisco.com>
 M:      Roopa Prabhu <roprabhu@cisco.com>
 M:      David Wang <dwang2@cisco.com>
@@ -2033,7 +2068,7 @@ F:	Documentation/scsi/dc395x.txt
 F:      drivers/scsi/dc395x.*
 
 DCCP PROTOCOL
-M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
+M:      Gerrit Renker <gerrit@erg.abdn.ac.uk>
 L:      dccp@vger.kernel.org
 W:      http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
 S:      Maintained
@@ -2102,6 +2137,12 @@ F:	Documentation/serial/digiepca.txt
 F:      drivers/char/epca*
 F:      drivers/char/digi*
 
+DIOLAN U2C-12 I2C DRIVER
+M:      Guenter Roeck <guenter.roeck@ericsson.com>
+L:      linux-i2c@vger.kernel.org
+S:      Maintained
+F:      drivers/i2c/busses/i2c-diolan-u2c.c
+
 DIRECTORY NOTIFICATION (DNOTIFY)
 M:      Eric Paris <eparis@parisplace.org>
 S:      Maintained
@@ -2348,7 +2389,7 @@ F:	include/linux/edac_mce.h
 
 EDAC-I82975X
 M:      Ranganathan Desikan <ravi@jetztechnologies.com>
-M:      "Arvind R." <arvind@jetztechnologies.com>
+M:      "Arvind R." <arvino55@gmail.com>
 L:      bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      bluesmoke.sourceforge.net
 S:      Maintained
@@ -2439,8 +2480,7 @@ F:	include/linux/cb710.h
 ENE KB2426 (ENE0100/ENE020XX) INFRARED RECEIVER
 M:      Maxim Levitsky <maximlevitsky@gmail.com>
 S:      Maintained
-F:      drivers/media/IR/ene_ir.c
-F:      drivers/media/IR/ene_ir.h
+F:      drivers/media/rc/ene_ir.*
 
 EPSON 1355 FRAMEBUFFER DRIVER
 M:      Christopher Hoover <ch@murgatroid.com>
@@ -2591,12 +2631,14 @@ F:	drivers/net/wan/dlci.c
 F:      drivers/net/wan/sdla.c
 
 FRAMEBUFFER LAYER
+M:      Paul Mundt <lethal@linux-sh.org>
 L:      linux-fbdev@vger.kernel.org
 W:      http://linux-fbdev.sourceforge.net/
 Q:      http://patchwork.kernel.org/project/linux-fbdev/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
-S:      Orphan
+S:      Maintained
 F:      Documentation/fb/
+F:      Documentation/devicetree/bindings/fb/
 F:      drivers/video/
 F:      include/video/
 F:      include/linux/fb.h
@@ -2784,7 +2826,6 @@ F:	include/linux/gigaset_dev.h
 
 GPIO SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
-L:      linux-kernel@vger.kernel.org
 S:      Maintained
 T:      git git://git.secretlab.ca/git/linux-2.6.git
 F:      Documentation/gpio/gpio.txt
@@ -2807,7 +2848,6 @@ F:	drivers/platform/x86/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
@@ -2816,7 +2856,7 @@ F:	mm/hwpoison-inject.c
 HYPERVISOR VIRTUAL CONSOLE DRIVER
 L:      linuxppc-dev@lists.ozlabs.org
 S:      Odd Fixes
-F:      drivers/char/hvc_*
+F:      drivers/tty/hvc/
 
 iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 M:      Peter Jones <pjones@redhat.com>
@@ -2908,7 +2948,7 @@ F:	Documentation/blockdev/cpqarray.txt
 F:      drivers/block/cpqarray.*
 
 HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
-M:      Stephen M. Cameron <scameron@beardog.cce.hp.com>
+M:      "Stephen M. Cameron" <scameron@beardog.cce.hp.com>
 L:      iss_storagedev@hp.com
 S:      Supported
 F:      Documentation/scsi/hpsa.txt
@@ -2965,7 +3005,7 @@ F:	kernel/hrtimer.c
 F:      kernel/time/clockevents.c
 F:      kernel/time/tick*.*
 F:      kernel/time/timer_*.c
-F       include/linux/clockevents.h
+F:      include/linux/clockevents.h
 F:      include/linux/hrtimer.h
 
 HIGH-SPEED SCC DRIVER FOR AX.25
@@ -3138,15 +3178,6 @@ L:	linux-pm@lists.linux-foundation.org
 S:      Supported
 F:      drivers/idle/i7300_idle.c
 
-IEEE 1394 SUBSYSTEM
-M:      Stefan Richter <stefanr@s5r6.in-berlin.de>
-L:      linux1394-devel@lists.sourceforge.net
-W:      http://ieee1394.wiki.kernel.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git
-S:      Obsolete
-F:      Documentation/debugging-via-ohci1394.txt
-F:      drivers/ieee1394/
-
 IEEE 802.15.4 SUBSYSTEM
 M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:      Sergey Lapin <slapin@ossfans.org>
@@ -3431,7 +3462,7 @@ M:	Jiri Kosina <jkosina@suse.cz>
 M:      David Sterba <dsterba@suse.cz>
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
-F:      drivers/char/pcmcia/ipwireless/
+F:      drivers/tty/ipwireless/
 
 IPX NETWORK LAYER
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
@@ -3444,6 +3475,7 @@ F:	net/ipx/
 IRDA SUBSYSTEM
 M:      Samuel Ortiz <samuel@sortiz.org>
 L:      irda-users@lists.sourceforge.net (subscribers-only)
+L:      netdev@vger.kernel.org
 W:      http://irda.sourceforge.net/
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
@@ -3519,7 +3551,7 @@ F:	drivers/hwmon/jc42.c
 F:      Documentation/hwmon/jc42
 
 JFS FILESYSTEM
-M:      Dave Kleikamp <shaggy@linux.vnet.ibm.com>
+M:      Dave Kleikamp <shaggy@kernel.org>
 L:      jfs-discussion@lists.sourceforge.net
 W:      http://jfs.sourceforge.net/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
@@ -3586,12 +3618,6 @@ W:	http://lse.sourceforge.net/kdump/
 S:      Maintained
 F:      Documentation/kdump/
 
-KERNEL AUTOMOUNTER (AUTOFS)
-M:      "H. Peter Anvin" <hpa@zytor.com>
-L:      autofs@linux.kernel.org
-S:      Obsolete
-F:      drivers/staging/autofs/
-
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:      Ian Kent <raven@themaw.net>
 L:      autofs@linux.kernel.org
@@ -3887,6 +3913,12 @@ L:	linux-security-module@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
 S:      Supported
 
+LIS3LV02D ACCELEROMETER DRIVER
+M:      Eric Piel <eric.piel@tremplin-utc.net>
+S:      Maintained
+F:      Documentation/misc-devices/lis3lv02d
+F:      drivers/misc/lis3lv02d/
+
 LLC (802.2)
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:      Maintained
@@ -3894,12 +3926,6 @@ F:	include/linux/llc.h
 F:      include/net/llc*
 F:      net/llc/
 
-LIS3LV02D ACCELEROMETER DRIVER
-M:      Eric Piel <eric.piel@tremplin-utc.net>
-S:      Maintained
-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
@@ -4195,7 +4221,7 @@ F:	Documentation/serial/moxa-smartio
 F:      drivers/char/mxser.*
 
 MSI LAPTOP SUPPORT
-M:      Lee, Chun-Yi <jlee@novell.com>
+M:      "Lee, Chun-Yi" <jlee@novell.com>
 L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/msi-laptop.c
@@ -4282,10 +4308,7 @@ S:	Maintained
 F:      net/sched/sch_netem.c
 
 NETERION 10GbE DRIVERS (s2io/vxge)
-M:      Ramkrishna Vepa <ramkrishna.vepa@exar.com>
-M:      Sivakumar Subramani <sivakumar.subramani@exar.com>
-M:      Sreenivasa Honnur <sreenivasa.honnur@exar.com>
-M:      Jon Mason <jon.mason@exar.com>
+M:      Jon Mason <jdmason@kudzu.us>
 L:      netdev@vger.kernel.org
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
@@ -4491,11 +4514,21 @@ S:	Maintained
 F:      arch/arm/*omap*/*clock*
 
 OMAP POWER MANAGEMENT SUPPORT
-M:      Kevin Hilman <khilman@deeprootsystems.com>
+M:      Kevin Hilman <khilman@ti.com>
 L:      linux-omap@vger.kernel.org
 S:      Maintained
 F:      arch/arm/*omap*/*pm*
 
+OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
+M:      Rajendra Nayak <rnayak@ti.com>
+M:      Paul Walmsley <paul@pwsan.com>
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
+F:      arch/arm/mach-omap2/powerdomain44xx.c
+F:      arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
+F:      arch/arm/mach-omap2/clockdomain44xx.c
+
 OMAP AUDIO SUPPORT
 M:      Jarkko Nikula <jhnikula@gmail.com>
 L:      alsa-devel@alsa-project.org (subscribers-only)
@@ -4504,14 +4537,14 @@ S:	Maintained
 F:      sound/soc/omap/
 
 OMAP FRAMEBUFFER SUPPORT
-M:      Tomi Valkeinen <tomi.valkeinen@nokia.com>
+M:      Tomi Valkeinen <tomi.valkeinen@ti.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>
+M:      Tomi Valkeinen <tomi.valkeinen@ti.com>
 L:      linux-omap@vger.kernel.org
 L:      linux-fbdev@vger.kernel.org
 S:      Maintained
@@ -4549,6 +4582,12 @@ L:	linux-omap@vger.kernel.org
 S:      Maintained
 F:      arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 
+OMAP IMAGE SIGNAL PROCESSOR (ISP)
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/video/omap3isp/*
+
 OMAP USB SUPPORT
 M:      Felipe Balbi <balbi@ti.com>
 M:      David Brownell <dbrownell@users.sourceforge.net>
@@ -4683,7 +4722,6 @@ F:	drivers/i2c/busses/i2c-pasemi.c
 
 PADATA PARALLEL EXECUTION MECHANISM
 M:      Steffen Klassert <steffen.klassert@secunet.com>
-L:      linux-kernel@vger.kernel.org
 L:      linux-crypto@vger.kernel.org
 S:      Maintained
 F:      kernel/padata.c
@@ -4833,7 +4871,6 @@ F:	include/crypto/pcrypt.h
 PER-CPU MEMORY ALLOCATOR
 M:      Tejun Heo <tj@kernel.org>
 M:      Christoph Lameter <cl@linux-foundation.org>
-L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
 S:      Maintained
 F:      include/linux/percpu*.h
@@ -4888,6 +4925,15 @@ S:	Maintained
 F:      drivers/block/pktcdvd.c
 F:      include/linux/pktcdvd.h
 
+PKUNITY SOC DRIVERS
+M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
+W:      http://mprc.pku.edu.cn/~guanxuetao/linux
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+F:      drivers/input/serio/i8042-unicore32io.h
+F:      drivers/i2c/busses/i2c-puv3.c
+F:      drivers/video/fb-puv3.c
+
 PMC SIERRA MaxRAID DRIVER
 M:      Anil Ravindranath <anil_ravindranath@pmc-sierra.com>
 L:      linux-scsi@vger.kernel.org
@@ -5151,6 +5197,7 @@ RALINK RT2X00 WIRELESS LAN DRIVER
 P:      rt2x00 project
 M:      Ivo van Doorn <IvDoorn@gmail.com>
 M:      Gertjan van Wingerde <gwingerde@gmail.com>
+M:      Helmut Schaa <helmut.schaa@googlemail.com>
 L:      linux-wireless@vger.kernel.org
 L:      users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:      http://rt2x00.serialmonkey.com/
@@ -5171,6 +5218,7 @@ F:	drivers/char/random.c
 
 RAPIDIO SUBSYSTEM
 M:      Matt Porter <mporter@kernel.crashing.org>
+M:      Alexandre Bounine <alexandre.bounine@idt.com>
 S:      Maintained
 F:      drivers/rapidio/
 
@@ -5329,8 +5377,7 @@ S:	Supported
 F:      drivers/s390/crypto/
 
 S390 ZFCP DRIVER
-M:      Christof Schmitt <christof.schmitt@de.ibm.com>
-M:      Swen Schillig <swen@vnet.ibm.com>
+M:      Steffen Maier <maier@linux.vnet.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -5369,6 +5416,12 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:      Supported
 F:      sound/soc/samsung
 
+SERIAL DRIVERS
+M:      Alan Cox <alan@linux.intel.com>
+L:      linux-serial@vger.kernel.org
+S:      Maintained
+F:      drivers/tty/serial
+
 TIMEKEEPING, NTP
 M:      John Stultz <johnstul@us.ibm.com>
 M:      Thomas Gleixner <tglx@linutronix.de>
@@ -5376,7 +5429,6 @@ S:	Supported
 F:      include/linux/clocksource.h
 F:      include/linux/time.h
 F:      include/linux/timex.h
-F:      include/linux/timekeeping.h
 F:      kernel/time/clocksource.c
 F:      kernel/time/time*.c
 F:      kernel/time/ntp.c
@@ -5464,7 +5516,7 @@ SCx200 CPU SUPPORT
 M:      Jim Cromie <jim.cromie@gmail.com>
 S:      Odd Fixes
 F:      Documentation/i2c/busses/scx200_acb
-F:      arch/x86/kernel/scx200_32.c
+F:      arch/x86/platform/scx200/
 F:      drivers/watchdog/scx200_wdt.c
 F:      drivers/i2c/busses/scx200*
 F:      drivers/mtd/maps/scx200_docflash.c
@@ -5608,24 +5660,13 @@ M:	Robin Holt <holt@sgi.com>
 S:      Maintained
 F:      drivers/misc/sgi-xp/
 
-SHARP LH SUPPORT (LH7952X & LH7A40X)
-M:      Marc Singer <elf@buici.com>
-W:      http://projects.buici.com/arm
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
-F:      Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
-F:      arch/arm/mach-lh7a40x/
-F:      drivers/tty/serial/serial_lh7a40x.c
-F:      drivers/usb/gadget/lh7a40*
-F:      drivers/usb/host/ohci-lh7a40*
-
 SIMPLE FIRMWARE INTERFACE (SFI)
 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
 S:      Supported
-F:      arch/x86/kernel/*sfi*
+F:      arch/x86/platform/sfi/
 F:      drivers/sfi/
 F:      include/linux/sfi*.h
 
@@ -5647,7 +5688,8 @@ F:	arch/arm/mach-s3c2410/bast-ide.c
 F:      arch/arm/mach-s3c2410/bast-irq.c
 
 TI DAVINCI MACHINE SUPPORT
-M:      Kevin Hilman <khilman@deeprootsystems.com>
+M:      Sekhar Nori <nsekhar@ti.com>
+M:      Kevin Hilman <khilman@ti.com>
 L:      davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 Q:      http://patchwork.kernel.org/project/linux-davinci/list/
 S:      Supported
@@ -5722,6 +5764,13 @@ S:	Supported
 F:      Documentation/hwmon/emc2103
 F:      drivers/hwmon/emc2103.c
 
+SMSC SCH5627 HARDWARE MONITOR DRIVER
+M:      Hans de Goede <hdegoede@redhat.com>
+L:      lm-sensors@lm-sensors.org
+S:      Supported
+F:      Documentation/hwmon/sch5627
+F:      drivers/hwmon/sch5627.c
+
 SMSC47B397 HARDWARE MONITOR DRIVER
 M:      "Mark M. Hoffman" <mhoffman@lightlink.com>
 L:      lm-sensors@lm-sensors.org
@@ -6073,13 +6122,11 @@ F:	sound/soc/codecs/twl4030*
 TIPC NETWORK LAYER
 M:      Jon Maloy <jon.maloy@ericsson.com>
 M:      Allan Stephens <allan.stephens@windriver.com>
-L:      tipc-discussion@lists.sourceforge.net
+L:      netdev@vger.kernel.org (core kernel code)
+L:      tipc-discussion@lists.sourceforge.net (user apps, general discussion)
 W:      http://tipc.sourceforge.net/
-W:      http://tipc.cslab.ericsson.net/
-T:      git git://tipc.cslab.ericsson.net/pub/git/tipc.git
 S:      Maintained
 F:      include/linux/tipc*.h
-F:      include/net/tipc/
 F:      net/tipc/
 
 TILE ARCHITECTURE
@@ -6087,8 +6134,9 @@ M:	Chris Metcalf <cmetcalf@tilera.com>
 W:      http://www.tilera.com/scm/
 S:      Supported
 F:      arch/tile/
-F:      drivers/char/hvc_tile.c
+F:      drivers/tty/hvc/hvc_tile.c
 F:      drivers/net/tile/
+F:      drivers/edac/tile_edac.c
 
 TLAN NETWORK DRIVER
 M:      Samuel Chessman <chessman@tux.org>
@@ -6251,6 +6299,13 @@ F:	drivers/uwb/
 F:      include/linux/uwb.h
 F:      include/linux/uwb/
 
+UNICORE32 ARCHITECTURE:
+M:      Guan Xuetao <gxt@mprc.pku.edu.cn>
+W:      http://mprc.pku.edu.cn/~guanxuetao/linux
+S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+F:      arch/unicore32/
+
 UNIFDEF
 M:      Tony Finch <dot@dotat.at>
 W:      http://dotat.at/prog/unifdef
@@ -6419,12 +6474,11 @@ S:	Maintained
 F:      drivers/net/usb/rtl8150.c
 
 USB SE401 DRIVER
-M:      Jeroen Vreeken <pe1rxq@amsat.org>
 L:      linux-usb@vger.kernel.org
 W:      http://www.chello.nl/~j.vreeken/se401/
-S:      Maintained
+S:      Orphan
 F:      Documentation/video4linux/se401.txt
-F:      drivers/media/video/se401.*
+F:      drivers/staging/se401/
 
 USB SERIAL BELKIN F5U103 DRIVER
 M:      William Greathouse <wgreathouse@smva.com>
@@ -6774,7 +6828,7 @@ F:	drivers/scsi/wd7000.c
 WINBOND CIR DRIVER
 M:      David Härdeman <david@hardeman.nu>
 S:      Maintained
-F:      drivers/input/misc/winbond-cir.c
+F:      drivers/media/rc/winbond-cir.c
 
 WIMAX STACK
 M:      Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
@@ -6851,7 +6905,6 @@ F:	sound/soc/codecs/wm*
 
 WORKQUEUE
 M:      Tejun Heo <tj@kernel.org>
-L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
 S:      Maintained
 F:      include/linux/workqueue.h