1 files changed, 132 insertions, 70 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4997519ea0ed..12dde1f795dd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -579,7 +579,7 @@ F:	drivers/net/appletalk/
 F:      net/appletalk/
 
 ARASAN COMPACT FLASH PATA CONTROLLER
-M:      Viresh Kumar <viresh.kumar@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
 L:      linux-ide@vger.kernel.org
 S:      Maintained
 F:      include/linux/pata_arasan_cf_data.h
@@ -1077,7 +1077,7 @@ F:	drivers/media/video/s5p-fimc/
 ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
 M:      Kamil Debski <k.debski@samsung.com>
-M:     Jeongtae Park <jtp.park@samsung.com>
+M:      Jeongtae Park <jtp.park@samsung.com>
 L:      linux-arm-kernel@lists.infradead.org
 L:      linux-media@vger.kernel.org
 S:      Maintained
@@ -1646,11 +1646,11 @@ S:	Maintained
 F:      drivers/gpio/gpio-bt8xx.c
 
 BTRFS FILE SYSTEM
-M:      Chris Mason <chris.mason@oracle.com>
+M:      Chris Mason <chris.mason@fusionio.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
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git
 S:      Maintained
 F:      Documentation/filesystems/btrfs.txt
 F:      fs/btrfs/
@@ -1743,10 +1743,10 @@ F:	include/linux/can/platform/
 CAPABILITIES
 M:      Serge Hallyn <serge.hallyn@canonical.com>
 L:      linux-security-module@vger.kernel.org
-S:      Supported       
+S:      Supported
 F:      include/linux/capability.h
 F:      security/capability.c
-F:      security/commoncap.c 
+F:      security/commoncap.c
 F:      kernel/capability.c
 
 CELL BROADBAND ENGINE ARCHITECTURE
@@ -1800,6 +1800,9 @@ F:	include/linux/cfag12864b.h
 CFG80211 and NL80211
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
+W:      http://wireless.kernel.org/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:      Maintained
 F:      include/linux/nl80211.h
 F:      include/net/cfg80211.h
@@ -1905,6 +1908,16 @@ F:	Documentation/filesystems/coda.txt
 F:      fs/coda/
 F:      include/linux/coda*.h
 
+COMMON CLK FRAMEWORK
+M:      Mike Turquette <mturquette@ti.com>
+M:      Mike Turquette <mturquette@linaro.org>
+L:      linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
+T:      git git://git.linaro.org/people/mturquette/linux.git
+S:      Maintained
+F:      drivers/clk/clk.c
+F:      drivers/clk/clk-*
+F:      include/linux/clk-pr*
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 M:      Steve French <sfrench@samba.org>
 L:      linux-cifs@vger.kernel.org
@@ -2136,11 +2149,11 @@ S:	Orphan
 F:      drivers/net/wan/pc300*
 
 CYTTSP TOUCHSCREEN DRIVER
-M:      Javier Martinez Canillas <javier@dowhile0.org>
-L:      linux-input@vger.kernel.org
-S:      Maintained
-F:      drivers/input/touchscreen/cyttsp*
-F:      include/linux/input/cyttsp.h
+M:      Javier Martinez Canillas <javier@dowhile0.org>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      drivers/input/touchscreen/cyttsp*
+F:      include/linux/input/cyttsp.h
 
 DAMA SLAVE for AX.25
 M:      Joerg Reuter <jreuter@yaina.de>
@@ -2260,7 +2273,7 @@ F:	include/linux/device-mapper.h
 F:      include/linux/dm-*.h
 
 DIOLAN U2C-12 I2C DRIVER
-M:      Guenter Roeck <guenter.roeck@ericsson.com>
+M:      Guenter Roeck <linux@roeck-us.net>
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/i2c/busses/i2c-diolan-u2c.c
@@ -2398,10 +2411,10 @@ F:	drivers/gpu/drm/
 F:      include/drm/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
-M:      Keith Packard <keithp@keithp.com>
+M:      Daniel Vetter <daniel.vetter@ffwll.ch>
 L:      intel-gfx@lists.freedesktop.org (subscribers-only)
 L:      dri-devel@lists.freedesktop.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git
+T:      git git://people.freedesktop.org/~danvet/drm-intel
 S:      Supported
 F:      drivers/gpu/drm/i915
 F:      include/drm/i915*
@@ -2718,6 +2731,13 @@ S:	Maintained
 F:      Documentation/hwmon/f71805f
 F:      drivers/hwmon/f71805f.c
 
+FC0011 TUNER DRIVER
+M:      Michael Buesch <m@bues.ch>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/common/tuners/fc0011.h
+F:      drivers/media/common/tuners/fc0011.c
+
 FANOTIFY
 M:      Eric Paris <eparis@redhat.com>
 S:      Maintained
@@ -2776,6 +2796,15 @@ T:	git git://git.alsa-project.org/alsa-kernel.git
 S:      Maintained
 F:      sound/firewire/
 
+FIREWIRE SBP-2 TARGET
+M:      Chris Boot <bootc@bootc.net>
+L:      linux-scsi@vger.kernel.org
+L:      target-devel@vger.kernel.org
+L:      linux1394-devel@lists.sourceforge.net
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
+S:      Maintained
+F:      drivers/target/sbp/
+
 FIREWIRE SUBSYSTEM
 M:      Stefan Richter <stefanr@s5r6.in-berlin.de>
 L:      linux1394-devel@lists.sourceforge.net
@@ -2792,6 +2821,12 @@ F:	Documentation/firmware_class/
 F:      drivers/base/firmware*.c
 F:      include/linux/firmware.h
 
+FLOPPY DRIVER
+M:      Jiri Kosina <jkosina@suse.cz>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
+S:      Odd fixes
+F:      drivers/block/floppy.c
+
 FPU EMULATOR
 M:      Bill Metzenthen <billm@melbpc.org.au>
 W:      http://floatingpoint.sourceforge.net/emulator/index.html
@@ -2898,6 +2933,13 @@ F:	Documentation/power/freezing-of-tasks.txt
 F:      include/linux/freezer.h
 F:      kernel/freezer.c
 
+FRONTSWAP API
+M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      mm/frontswap.c
+F:      include/linux/frontswap.h
+
 FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
 M:      David Howells <dhowells@redhat.com>
 L:      linux-cachefs@redhat.com
@@ -2912,7 +2954,7 @@ S:	Maintained
 F:      arch/frv/
 
 FUJITSU LAPTOP EXTRAS
-M:      Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
+M:      Jonathan Woithe <jwoithe@just42.net>
 L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/fujitsu-laptop.c
@@ -2962,9 +3004,9 @@ GENERIC GPIO I2C MULTIPLEXER DRIVER
 M:      Peter Korsgaard <peter.korsgaard@barco.com>
 L:      linux-i2c@vger.kernel.org
 S:      Supported
-F:      drivers/i2c/muxes/gpio-i2cmux.c
-F:      include/linux/gpio-i2cmux.h
-F:      Documentation/i2c/muxes/gpio-i2cmux
+F:      drivers/i2c/muxes/i2c-mux-gpio.c
+F:      include/linux/i2c-mux-gpio.h
+F:      Documentation/i2c/muxes/i2c-mux-gpio
 
 GENERIC HDLC (WAN) DRIVERS
 M:      Krzysztof Halasa <khc@pm.waw.pl>
@@ -3106,7 +3148,7 @@ F:	drivers/tty/hvc/
 
 HARDWARE MONITORING
 M:      Jean Delvare <khali@linux-fr.org>
-M:      Guenter Roeck <guenter.roeck@ericsson.com>
+M:      Guenter Roeck <linux@roeck-us.net>
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
 T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
@@ -3206,10 +3248,8 @@ F:	include/linux/clockchips.h
 F:      include/linux/hrtimer.h
 
 HIGH-SPEED SCC DRIVER FOR AX.25
-M:      Klaus Kudielka <klaus.kudielka@ieee.org>
 L:      linux-hams@vger.kernel.org
-W:      http://www.nt.tuwien.ac.at/~kkudielk/Linux/
-S:      Maintained
+S:      Orphan
 F:      drivers/net/hamradio/dmascc.c
 F:      drivers/net/hamradio/scc.c
 
@@ -3338,12 +3378,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 S:      Maintained
 F:      arch/ia64/
 
-IBM MCA SCSI SUBSYSTEM DRIVER
-M:      Michael Lang <langa2@kph.uni-mainz.de>
-W:      http://www.uni-mainz.de/~langm000/linux.html
-S:      Maintained
-F:      drivers/scsi/ibmmca.c
-
 IBM Power Linux RAID adapter
 M:      Brian King <brking@us.ibm.com>
 S:      Supported
@@ -3362,6 +3396,12 @@ W:	http://www.developer.ibm.com/welcome/netfinity/serveraid.html
 S:      Supported
 F:      drivers/scsi/ips.*
 
+ICH LPC AND GPIO DRIVER
+M:      Peter Tyser <ptyser@xes-inc.com>
+S:      Maintained
+F:      drivers/mfd/lpc_ich.c
+F:      drivers/gpio/gpio-ich.c
+
 IDE SUBSYSTEM
 M:      "David S. Miller" <davem@davemloft.net>
 L:      linux-ide@vger.kernel.org
@@ -3393,13 +3433,14 @@ S:	Supported
 F:      drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
+M:      Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
 M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-M:      Sergey Lapin <slapin@ossfans.org>
 L:      linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:      http://apps.sourceforge.net/trac/linux-zigbee
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
 S:      Maintained
 F:      net/ieee802154/
+F:      net/mac802154/
 F:      drivers/ieee802154/
 
 IIO SUBSYSTEM AND DRIVERS
@@ -3455,6 +3496,8 @@ 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/
+F:      include/linux/input.h
+F:      include/linux/input/
 
 INPUT MULTITOUCH (MT) PROTOCOL
 M:      Henrik Rydberg <rydberg@euromail.se>
@@ -4064,6 +4107,8 @@ F:	drivers/scsi/53c700*
 LED SUBSYSTEM
 M:      Bryan Wu <bryan.wu@canonical.com>
 M:      Richard Purdie <rpurdie@rpsys.net>
+L:      linux-leds@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
 S:      Maintained
 F:      drivers/leds/
 F:      include/linux/leds.h
@@ -4308,7 +4353,8 @@ MAC80211
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:      Maintained
 F:      Documentation/networking/mac80211-injection.txt
 F:      include/net/mac80211.h
@@ -4319,7 +4365,8 @@ M:	Stefano Brivio <stefano.brivio@polimi.it>
 M:      Mattias Nissler <mattias.nissler@gmx.de>
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:      Maintained
 F:      net/mac80211/rc80211_pid*
 
@@ -4379,6 +4426,13 @@ S:	Orphan
 F:      drivers/video/matrox/matroxfb_*
 F:      include/linux/matroxfb.h
 
+MAX16065 HARDWARE MONITOR DRIVER
+M:      Guenter Roeck <linux@roeck-us.net>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/max16065
+F:      drivers/hwmon/max16065.c
+
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
 L:      lm-sensors@lm-sensors.org
@@ -4449,13 +4503,6 @@ T:	git git://git.monstr.eu/linux-2.6-microblaze.git
 S:      Supported
 F:      arch/microblaze/
 
-MICROCHANNEL ARCHITECTURE (MCA)
-M:      James Bottomley <James.Bottomley@HansenPartnership.com>
-S:      Maintained
-F:      Documentation/mca.txt
-F:      drivers/mca/
-F:      include/linux/mca*
-
 MICROTEK X6 SCANNER
 M:      Oliver Neukum <oliver@neukum.name>
 S:      Maintained
@@ -4490,12 +4537,6 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      drivers/mmc/host/imxmmc.*
 
-MOUSE AND MISC DEVICES [GENERAL]
-M:      Alessandro Rubini <rubini@ipvvis.unipv.it>
-S:      Maintained
-F:      drivers/input/mouse/
-F:      include/linux/gpio_mouse.h
-
 MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
 M:      Jiri Slaby <jirislaby@gmail.com>
 S:      Maintained
@@ -4614,8 +4655,8 @@ L:	netfilter@vger.kernel.org
 L:      coreteam@netfilter.org
 W:      http://www.netfilter.org/
 W:      http://www.iptables.org/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
+T:      git git://1984.lsi.us.es/nf
+T:      git git://1984.lsi.us.es/nf-next
 S:      Supported
 F:      include/linux/netfilter*
 F:      include/linux/netfilter/
@@ -4817,6 +4858,7 @@ M:	Kevin Hilman <khilman@ti.com>
 L:      linux-omap@vger.kernel.org
 S:      Maintained
 F:      arch/arm/*omap*/*pm*
+F:      drivers/cpufreq/omap-cpufreq.c
 
 OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
 M:      Rajendra Nayak <rnayak@ti.com>
@@ -5130,10 +5172,10 @@ F:	drivers/leds/leds-pca9532.c
 F:      include/linux/leds-pca9532.h
 
 PCA9541 I2C BUS MASTER SELECTOR DRIVER
-M:      Guenter Roeck <guenter.roeck@ericsson.com>
+M:      Guenter Roeck <linux@roeck-us.net>
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
-F:      drivers/i2c/muxes/pca9541.c
+F:      drivers/i2c/muxes/i2c-mux-pca9541.c
 
 PCA9564/PCA9665 I2C BUS DRIVER
 M:      Wolfram Sang <w.sang@pengutronix.de>
@@ -5150,7 +5192,7 @@ S:	Maintained
 F:      drivers/firmware/pcdp.*
 
 PCI ERROR RECOVERY
-M:     Linas Vepstas <linasvepstas@gmail.com>
+M:      Linas Vepstas <linasvepstas@gmail.com>
 L:      linux-pci@vger.kernel.org
 S:      Supported
 F:      Documentation/PCI/pci-error-recovery.txt
@@ -5256,7 +5298,7 @@ S:	Maintained
 F:      drivers/pinctrl/
 
 PIN CONTROLLER - ST SPEAR
-M:      Viresh Kumar <viresh.kumar@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -5280,7 +5322,7 @@ F:	drivers/video/fb-puv3.c
 F:      drivers/rtc/rtc-puv3.c
 
 PMBUS HARDWARE MONITORING DRIVERS
-M:      Guenter Roeck <guenter.roeck@ericsson.com>
+M:      Guenter Roeck <linux@roeck-us.net>
 L:      lm-sensors@lm-sensors.org
 W:      http://www.lm-sensors.org/
 W:      http://www.roeck-us.net/linux/drivers/
@@ -5318,7 +5360,7 @@ M:	David Woodhouse <dwmw2@infradead.org>
 T:      git git://git.infradead.org/battery-2.6.git
 S:      Maintained
 F:      include/linux/power_supply.h
-F:      drivers/power/power_supply*
+F:      drivers/power/
 
 PNP SUPPORT
 M:      Adam Belay <abelay@mit.edu>
@@ -5676,6 +5718,9 @@ F:	include/linux/remoteproc.h
 RFKILL
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
+W:      http://wireless.kernel.org/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:      Maintained
 F:      Documentation/rfkill.txt
 F:      net/rfkill/
@@ -5830,7 +5875,7 @@ S:	Maintained
 F:      drivers/tty/serial
 
 SYNOPSYS DESIGNWARE DMAC DRIVER
-M:      Viresh Kumar <viresh.kumar@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
 S:      Maintained
 F:      include/linux/dw_dmac.h
 F:      drivers/dma/dw_dmac_regs.h
@@ -5866,7 +5911,7 @@ M:	Ingo Molnar <mingo@redhat.com>
 M:      Peter Zijlstra <peterz@infradead.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
 S:      Maintained
-F:      kernel/sched*
+F:      kernel/sched/
 F:      include/linux/sched.h
 
 SCORE ARCHITECTURE
@@ -5978,7 +6023,7 @@ S:	Maintained
 F:      drivers/mmc/host/sdhci-s3c.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
-M:      Viresh Kumar <viresh.kumar@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-mmc@vger.kernel.org
 S:      Maintained
@@ -6334,15 +6379,26 @@ S:	Maintained
 F:      include/linux/compiler.h
 
 SPEAR PLATFORM SUPPORT
-M:      Viresh Kumar <viresh.kumar@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
 S:      Maintained
 F:      arch/arm/plat-spear/
 
+SPEAR13XX MACHINE SUPPORT
+M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Shiraz Hashim <shiraz.hashim@st.com>
+L:      spear-devel@list.st.com
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+W:      http://www.st.com/spear
+S:      Maintained
+F:      arch/arm/mach-spear13xx/
+
 SPEAR3XX MACHINE SUPPORT
-M:      Viresh Kumar <viresh.kumar@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
+M:      Shiraz Hashim <shiraz.hashim@st.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -6351,6 +6407,8 @@ F:	arch/arm/mach-spear3xx/
 
 SPEAR6XX MACHINE SUPPORT
 M:      Rajeev Kumar <rajeev-dlh.kumar@st.com>
+M:      Shiraz Hashim <shiraz.hashim@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
@@ -6358,14 +6416,12 @@ S:	Maintained
 F:      arch/arm/mach-spear6xx/
 
 SPEAR CLOCK FRAMEWORK SUPPORT
-M:      Viresh Kumar <viresh.kumar@st.com>
+M:     Viresh Kumar <viresh.linux@gmail.com>
 L:      spear-devel@list.st.com
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.st.com/spear
 S:      Maintained
-F:      arch/arm/mach-spear*/clock.c
-F:      arch/arm/plat-spear/clock.c
-F:      arch/arm/plat-spear/include/plat/clock.h
+F:      drivers/clk/spear/
 
 SPI SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
@@ -6573,7 +6629,7 @@ 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 sh-latest
+T:      git git://github.com/pmundt/linux-sh.git sh-latest
 S:      Supported
 F:      Documentation/sh/
 F:      arch/sh/
@@ -6627,7 +6683,7 @@ F:	include/linux/taskstats*
 F:      kernel/taskstats.c
 
 TC CLASSIFIER
-M:      Jamal Hadi Salim <hadi@cyberus.ca>
+M:      Jamal Hadi Salim <jhs@mojatatu.com>
 L:      netdev@vger.kernel.org
 S:      Maintained
 F:      include/linux/pkt_cls.h
@@ -6691,6 +6747,12 @@ F:	drivers/misc/tifm*
 F:      drivers/mmc/host/tifm_sd.c
 F:      include/linux/tifm.h
 
+TI LM49xxx FAMILY ASoC CODEC DRIVERS
+M:      M R Swami Reddy <mr.swami.reddy@ti.com>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Maintained
+F:      sound/soc/codecs/lm49453*
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:      Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -7196,7 +7258,7 @@ F:	include/linux/usb/usbnet.h
 
 USB VIDEO CLASS
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-L:      linux-uvc-devel@lists.berlios.de (subscribers-only)
+L:      linux-uvc-devel@lists.sourceforge.net (subscribers-only)
 L:      linux-media@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 W:      http://www.ideasonboard.org/uvc/
@@ -7262,11 +7324,11 @@ F:	Documentation/DocBook/uio-howto.tmpl
 F:      drivers/uio/
 F:      include/linux/uio*.h
 
-UTIL-LINUX-NG PACKAGE
+UTIL-LINUX PACKAGE
 M:      Karel Zak <kzak@redhat.com>
-L:      util-linux-ng@vger.kernel.org
-W:      http://kernel.org/~kzak/util-linux-ng/
-T:      git git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git
+L:      util-linux@vger.kernel.org
+W:      http://en.wikipedia.org/wiki/Util-linux
+T:      git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
 S:      Maintained
 
 UVESAFB DRIVER
@@ -7368,7 +7430,7 @@ F:	include/linux/vlynq.h
 
 VME SUBSYSTEM
 M:      Martyn Welch <martyn.welch@ge.com>
-M:      Manohar Vanga <manohar.vanga@cern.ch>
+M:      Manohar Vanga <manohar.vanga@gmail.com>
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      devel@driverdev.osuosl.org
 S:      Maintained
@@ -7619,7 +7681,7 @@ XFS FILESYSTEM
 P:      Silicon Graphics Inc
 M:      Ben Myers <bpm@sgi.com>
 M:      Alex Elder <elder@kernel.org>
-M:      xfs-masters@oss.sgi.com
+M:      xfs@oss.sgi.com
 L:      xfs@oss.sgi.com
 W:      http://oss.sgi.com/projects/xfs
 T:      git git://oss.sgi.com/xfs/xfs.git