ath10k: rename ath10k_pci_hif_dump_area() to ath10k_pci_fw_crashed_dump()
[cascardo/linux.git] / MAINTAINERS
index 05dafe1..0057ff5 100644 (file)
@@ -148,6 +148,13 @@ L: linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/53c700*
 
+6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
+M:     Alexander Aring <alex.aring@gmail.com>
+L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:     linux-bluetooth@vger.kernel.org
+S:     Maintained
+F:     net/6lowpan/
+
 6PACK NETWORK DRIVER FOR AX.25
 M:     Andreas Koensgen <ajk@comnets.uni-bremen.de>
 L:     linux-hams@vger.kernel.org
@@ -210,6 +217,13 @@ S: Supported
 F:     Documentation/scsi/aacraid.txt
 F:     drivers/scsi/aacraid/
 
+ABI/API
+L:     linux-api@vger.kernel.org
+F:     Documentation/ABI/
+F:     include/linux/syscalls.h
+F:     include/uapi/
+F:     kernel/sys_ni.c
+
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     lm-sensors@lm-sensors.org
@@ -355,7 +369,7 @@ F:  Documentation/hwmon/adm1025
 F:     drivers/hwmon/adm1025.c
 
 ADM1029 HARDWARE MONITOR DRIVER
-M:     Corentin Labbe <corentin.labbe@geomatys.fr>
+M:     Corentin Labbe <clabbe.montjoie@gmail.com>
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
 F:     drivers/hwmon/adm1029.c
@@ -654,7 +668,7 @@ F:  sound/soc/codecs/ssm*
 F:     sound/soc/codecs/sigmadsp.*
 
 ANALOG DEVICES INC ASOC DRIVERS
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
 S:     Supported
@@ -815,6 +829,11 @@ F: arch/arm/boot/dts/at91*.dtsi
 F:     arch/arm/boot/dts/sama*.dts
 F:     arch/arm/boot/dts/sama*.dtsi
 
+ARM/ATMEL AT91 Clock Support
+M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+S:     Maintained
+F:     drivers/clk/at91
+
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1624,12 +1643,6 @@ S:       Supported
 F:     drivers/misc/atmel_tclib.c
 F:     drivers/clocksource/tcb_clksrc.c
 
-ATMEL TSADCC DRIVER
-M:     Josh Wu <josh.wu@atmel.com>
-L:     linux-input@vger.kernel.org
-S:     Supported
-F:     drivers/input/touchscreen/atmel_tsadcc.c
-
 ATMEL USBA UDC DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1771,54 +1784,54 @@ F:      include/uapi/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
 M:     Steven Miao <realmz6@gmail.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 T:     git git://git.code.sf.net/p/adi-linux/code
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     arch/blackfin/
 
 BLACKFIN EMAC DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/net/ethernet/adi/
 
 BLACKFIN RTC DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/rtc/rtc-bfin.c
 
 BLACKFIN SDH DRIVER
 M:     Sonic Zhang <sonic.zhang@analog.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/mmc/host/bfin_sdh.c
 
 BLACKFIN SERIAL DRIVER
 M:     Sonic Zhang <sonic.zhang@analog.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/tty/serial/bfin_uart.c
 
 BLACKFIN WATCHDOG DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/watchdog/bfin_wdt.c
 
 BLACKFIN I2C TWI DRIVER
 M:     Sonic Zhang <sonic.zhang@analog.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
 S:     Supported
 F:     drivers/i2c/busses/i2c-bfin-twi.c
 
 BLACKFIN MEDIA DRIVER
 M:     Scott Jiang <scott.jiang.linux@gmail.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
 S:     Supported
 F:     drivers/media/platform/blackfin/
@@ -2207,6 +2220,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 S:     Supported
 F:     drivers/char/*
 F:     drivers/misc/*
+F:     include/linux/miscdevice.h
 
 CHECKPATCH
 M:     Andy Whitcroft <apw@canonical.com>
@@ -2389,16 +2403,35 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/connector/
 
-CONTROL GROUPS (CGROUPS)
+CONTROL GROUP (CGROUP)
 M:     Tejun Heo <tj@kernel.org>
 M:     Li Zefan <lizefan@huawei.com>
-L:     containers@lists.linux-foundation.org
 L:     cgroups@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
+F:     Documentation/cgroups/
 F:     include/linux/cgroup*
 F:     kernel/cgroup*
-F:     mm/*cgroup*
+
+CONTROL GROUP - CPUSET
+M:     Li Zefan <lizefan@huawei.com>
+L:     cgroups@vger.kernel.org
+W:     http://www.bullopensource.org/cpuset/
+W:     http://oss.sgi.com/projects/cpusets/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+S:     Maintained
+F:     Documentation/cgroups/cpusets.txt
+F:     include/linux/cpuset.h
+F:     kernel/cpuset.c
+
+CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
+M:     Johannes Weiner <hannes@cmpxchg.org>
+M:     Michal Hocko <mhocko@suse.cz>
+L:     cgroups@vger.kernel.org
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     mm/memcontrol.c
+F:     mm/page_cgroup.c
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:     Fenghua Yu <fenghua.yu@intel.com>
@@ -2422,7 +2455,6 @@ F:        drivers/net/ethernet/ti/cpmac.c
 CPU FREQUENCY DRIVERS
 M:     Rafael J. Wysocki <rjw@rjwysocki.net>
 M:     Viresh Kumar <viresh.kumar@linaro.org>
-L:     cpufreq@vger.kernel.org
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
@@ -2433,7 +2465,6 @@ F:        include/linux/cpufreq.h
 CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 M:     Viresh Kumar <viresh.kumar@linaro.org>
 M:     Sudeep Holla <sudeep.holla@arm.com>
-L:     cpufreq@vger.kernel.org
 L:     linux-pm@vger.kernel.org
 W:     http://www.arm.com/products/processors/technologies/biglittleprocessing.php
 S:     Maintained
@@ -2471,17 +2502,6 @@ M:       Thomas Renninger <trenn@suse.de>
 S:     Maintained
 F:     tools/power/cpupower/
 
-CPUSETS
-M:     Li Zefan <lizefan@huawei.com>
-L:     cgroups@vger.kernel.org
-W:     http://www.bullopensource.org/cpuset/
-W:     http://oss.sgi.com/projects/cpusets/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
-S:     Maintained
-F:     Documentation/cgroups/cpusets.txt
-F:     include/linux/cpuset.h
-F:     kernel/cpuset.c
-
 CRAMFS FILESYSTEM
 W:     http://sourceforge.net/projects/cramfs/
 S:     Orphan / Obsolete
@@ -2581,7 +2601,7 @@ S:        Supported
 F:     drivers/infiniband/hw/cxgb3/
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Dimitris Michailidis <dm@chelsio.com>
+M:     Hariprasad S <hariprasad@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -2699,6 +2719,15 @@ S:       Orphan
 F:     Documentation/networking/decnet.txt
 F:     net/decnet/
 
+DECSTATION PLATFORM SUPPORT
+M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+L:     linux-mips@linux-mips.org
+W:     http://www.linux-mips.org/wiki/DECstation
+S:     Maintained
+F:     arch/mips/dec/
+F:     arch/mips/include/asm/dec/
+F:     arch/mips/include/asm/mach-dec/
+
 DEFXX FDDI NETWORK DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
@@ -2796,12 +2825,14 @@ F:      sound/soc/codecs/da[79]*.[ch]
 
 DIGI NEO AND CLASSIC PCI PRODUCTS
 M:     Lidza Louina <lidza.louina@gmail.com>
+M:     Mark Hounschell <markh@compro.net>
 L:     driverdev-devel@linuxdriverproject.org
 S:     Maintained
 F:     drivers/staging/dgnc/
 
 DIGI EPCA PCI PRODUCTS
 M:     Lidza Louina <lidza.louina@gmail.com>
+M:     Mark Hounschell <markh@compro.net>
 L:     driverdev-devel@linuxdriverproject.org
 S:     Maintained
 F:     drivers/staging/dgap/
@@ -2940,6 +2971,7 @@ L:        dri-devel@lists.freedesktop.org
 T:     git git://people.freedesktop.org/~airlied/linux
 S:     Maintained
 F:     drivers/gpu/drm/
+F:     drivers/gpu/vga/
 F:     include/drm/
 F:     include/uapi/drm/
 
@@ -3780,7 +3812,8 @@ F:        fs/fscache/
 F:     include/linux/fscache*.h
 
 F2FS FILE SYSTEM
-M:     Jaegeuk Kim <jaegeuk.kim@samsung.com>
+M:     Jaegeuk Kim <jaegeuk@kernel.org>
+M:     Changman Lee <cm224.lee@samsung.com>
 L:     linux-f2fs-devel@lists.sourceforge.net
 W:     http://en.wikipedia.org/wiki/F2FS
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@ -3898,6 +3931,11 @@ L:       kvm@vger.kernel.org
 S:     Supported
 F:     drivers/uio/uio_pci_generic.c
 
+GET_MAINTAINER SCRIPT
+M:     Joe Perches <joe@perches.com>
+S:     Maintained
+F:     scripts/get_maintainer.pl
+
 GFS2 FILE SYSTEM
 M:     Steven Whitehouse <swhiteho@redhat.com>
 L:     cluster-devel@redhat.com
@@ -4022,9 +4060,8 @@ S:        Odd Fixes
 F:     drivers/media/usb/hdpvr/
 
 HWPOISON MEMORY FAILURE HANDLING
-M:     Andi Kleen <andi@firstfloor.org>
+M:     Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
 L:     linux-mm@kvack.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 S:     Maintained
 F:     mm/memory-failure.c
 F:     mm/hwpoison-inject.c
@@ -4215,9 +4252,11 @@ S:       Maintained
 F:     fs/hpfs/
 
 HSI SUBSYSTEM
-M:     Sebastian Reichel <sre@debian.org>
+M:     Sebastian Reichel <sre@kernel.org>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-hsi
+F:     Documentation/hsi.txt
 F:     drivers/hsi/
 F:     include/linux/hsi/
 F:     include/uapi/linux/hsi/
@@ -4372,7 +4411,7 @@ S:        Supported
 F:     drivers/crypto/nx/
 
 IBM Power 842 compression accelerator
-M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+M:     Nathan Fontenot <nfont@linux.vnet.ibm.com>
 S:     Supported
 F:     drivers/crypto/nx/nx-842.c
 F:     include/linux/nx842.h
@@ -4388,12 +4427,18 @@ L:      netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmveth.*
 
-IBM Power Virtual SCSI/FC Device Drivers
-M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+IBM Power Virtual SCSI Device Drivers
+M:     Nathan Fontenot <nfont@linux.vnet.ibm.com>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/ibmvscsi/ibmvscsi*
+F:     drivers/scsi/ibmvscsi/viosrp.h
+
+IBM Power Virtual FC Device Drivers
+M:     Brian King <brking@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
-F:     drivers/scsi/ibmvscsi/
-X:     drivers/scsi/ibmvscsi/ibmvstgt.c
+F:     drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM ServeRAID RAID DRIVER
 P:     Jack Hammer
@@ -5591,16 +5636,6 @@ F:       Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
 
-MAC80211 PID RATE CONTROL
-M:     Stefano Brivio <stefano.brivio@polimi.it>
-M:     Mattias Nissler <mattias.nissler@gmx.de>
-L:     linux-wireless@vger.kernel.org
-W:     http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
-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*
-
 MACVLAN DRIVER
 M:     Patrick McHardy <kaber@trash.net>
 L:     netdev@vger.kernel.org
@@ -5756,17 +5791,6 @@ F:       include/linux/memory_hotplug.h
 F:     include/linux/vmalloc.h
 F:     mm/
 
-MEMORY RESOURCE CONTROLLER
-M:     Johannes Weiner <hannes@cmpxchg.org>
-M:     Michal Hocko <mhocko@suse.cz>
-M:     Balbir Singh <bsingharora@gmail.com>
-M:     KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-L:     cgroups@vger.kernel.org
-L:     linux-mm@kvack.org
-S:     Maintained
-F:     mm/memcontrol.c
-F:     mm/page_cgroup.c
-
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:     David Woodhouse <dwmw2@infradead.org>
 M:     Brian Norris <computersforpeace@gmail.com>
@@ -5960,6 +5984,7 @@ M:        Chris Ball <chris@printf.net>
 M:     Ulf Hansson <ulf.hansson@linaro.org>
 L:     linux-mmc@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
+T:     git git://git.linaro.org/people/ulf.hansson/mmc.git
 S:     Maintained
 F:     drivers/mmc/
 F:     include/linux/mmc/
@@ -6021,6 +6046,28 @@ M:       Petr Vandrovec <petr@vandrovec.name>
 S:     Odd Fixes
 F:     fs/ncpfs/
 
+NCR 5380 SCSI DRIVERS
+M:     Finn Thain <fthain@telegraphics.com.au>
+M:     Michael Schmitz <schmitzmic@gmail.com>
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+F:     Documentation/scsi/g_NCR5380.txt
+F:     drivers/scsi/NCR5380.*
+F:     drivers/scsi/arm/cumana_1.c
+F:     drivers/scsi/arm/oak.c
+F:     drivers/scsi/atari_NCR5380.c
+F:     drivers/scsi/atari_scsi.*
+F:     drivers/scsi/dmx3191d.c
+F:     drivers/scsi/dtc.*
+F:     drivers/scsi/g_NCR5380.*
+F:     drivers/scsi/g_NCR5380_mmio.c
+F:     drivers/scsi/mac_scsi.*
+F:     drivers/scsi/pas16.*
+F:     drivers/scsi/sun3_NCR5380.c
+F:     drivers/scsi/sun3_scsi.*
+F:     drivers/scsi/sun3_scsi_vme.c
+F:     drivers/scsi/t128.*
+
 NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 L:     linux-scsi@vger.kernel.org
@@ -6430,6 +6477,7 @@ F:        drivers/usb/*/*omap*
 F:     arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
+M:     Javier Martinez Canillas <javier@dowhile0.org>
 M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
 M:     Kevin Hilman <khilman@deeprootsystems.com>
 L:     linux-omap@vger.kernel.org
@@ -6719,6 +6767,7 @@ F:        Documentation/PCI/
 F:     drivers/pci/
 F:     include/linux/pci*
 F:     arch/x86/pci/
+F:     arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:     Richard Zhu <r65037@freescale.com>
@@ -6766,6 +6815,14 @@ L:       linux-pci@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/host/*designware*
 
+PCI DRIVER FOR GENERIC OF HOSTS
+M:     Will Deacon <will.deacon@arm.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/host-generic-pci.txt
+F:     drivers/pci/host/pci-host-generic.c
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org
@@ -6950,7 +7007,6 @@ F:        drivers/power/
 
 PNP SUPPORT
 M:     Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-M:     Bjorn Helgaas <bhelgaas@google.com>
 S:     Maintained
 F:     drivers/pnp/
 
@@ -7674,7 +7730,6 @@ L:        linux-media@vger.kernel.org
 Q:     https://patchwork.linuxtv.org/project/linux-media/list/
 S:     Supported
 F:     drivers/media/platform/exynos4-is/
-F:     include/media/s5p_fimc.h
 
 SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
 M:     Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
@@ -7977,6 +8032,26 @@ M:       Robin Holt <robinmholt@gmail.com>
 S:     Maintained
 F:     drivers/misc/sgi-xp/
 
+SI2157 MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+W:     http://palosaari.fi/linux/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+T:     git git://linuxtv.org/anttip/media_tree.git
+S:     Maintained
+F:     drivers/media/tuners/si2157*
+
+SI2168 MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+W:     http://linuxtv.org/
+W:     http://palosaari.fi/linux/
+Q:     http://patchwork.linuxtv.org/project/linux-media/list/
+T:     git git://linuxtv.org/anttip/media_tree.git
+S:     Maintained
+F:     drivers/media/dvb-frontends/si2168*
+
 SI470X FM RADIO RECEIVER I2C DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
@@ -8276,6 +8351,7 @@ L:        alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:     http://www.alsa-project.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 T:     git git://git.alsa-project.org/alsa-kernel.git
+Q:     http://patchwork.kernel.org/project/alsa-devel/list/
 S:     Maintained
 F:     Documentation/sound/
 F:     include/sound/
@@ -8496,7 +8572,7 @@ S:        Maintained
 F:     drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:     Rupesh Gujare <rupesh.gujare@atmel.com>
+M:     Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
 S:     Maintained
 F:     drivers/staging/ozwpan/
 
@@ -8511,6 +8587,13 @@ M:       Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 S:     Odd Fixes
 F:     drivers/staging/rtl8712/
 
+STAGING - REALTEK RTL8723U WIRELESS DRIVER
+M:     Larry Finger <Larry.Finger@lwfinger.net>
+M:     Jes Sorensen <Jes.Sorensen@redhat.com>
+L:     linux-wireless@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/rtl8723au/
+
 STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 M:     Teddy Wang <teddy.wang@siliconmotion.com.cn>
 S:     Odd Fixes
@@ -9032,7 +9115,7 @@ F:        include/linux/toshiba.h
 F:     include/uapi/linux/toshiba.h
 
 TMIO MMC DRIVER
-M:     Ian Molton <ian@mnementh.co.uk>
+M:     Ian Molton <ian.molton@codethink.co.uk>
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/tmio_mmc*
@@ -9073,7 +9156,6 @@ F:        drivers/char/tpm/
 
 TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
-M:     Frederic Weisbecker <fweisbec@gmail.com>
 M:     Ingo Molnar <mingo@redhat.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:     Maintained