1 files changed, 24 insertions, 18 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 915564eda145..7281a7b9224b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -228,7 +228,7 @@ S:	Maintained
 F:      drivers/platform/x86/acerhdf.c
 
 ACER WMI LAPTOP EXTRAS
-M:      Joey Lee <jlee@novell.com>
+M:      "Lee, Chun-Yi" <jlee@suse.com>
 L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/acer-wmi.c
@@ -648,7 +648,7 @@ F:	arch/arm/
 
 ARM SUB-ARCHITECTURES
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      MAINTAINED
+S:      Maintained
 F:      arch/arm/mach-*/
 F:      arch/arm/plat-*/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
@@ -1351,6 +1351,14 @@ W:	http://wireless.kernel.org/en/users/Drivers/ath9k
 S:      Supported
 F:      drivers/net/wireless/ath/ath9k/
 
+WILOCITY WIL6210 WIRELESS DRIVER
+M:      Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
+L:      linux-wireless@vger.kernel.org
+L:      wil6210@qca.qualcomm.com
+S:      Supported
+W:      http://wireless.kernel.org/en/users/Drivers/wil6210
+F:      drivers/net/wireless/ath/wil6210/
+
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 M:      Christian Lamparter <chunkeey@googlemail.com>
 L:      linux-wireless@vger.kernel.org
@@ -1964,9 +1972,9 @@ S:	Maintained
 F:      drivers/usb/host/ohci-ep93xx.c
 
 CIRRUS LOGIC CS4270 SOUND DRIVER
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:      Supported
+S:      Odd Fixes
 F:      sound/soc/codecs/cs4270*
 
 CLEANCACHE API
@@ -3183,9 +3191,9 @@ F:	include/uapi/video/
 F:      include/uapi/linux/fb.h
 
 FREESCALE DIU FRAMEBUFFER DRIVER
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      linux-fbdev@vger.kernel.org
-S:      Supported
+S:      Maintained
 F:      drivers/video/fsl-diu-fb.*
 
 FREESCALE DMA DRIVER
@@ -3220,9 +3228,8 @@ F:	drivers/net/ethernet/freescale/fs_enet/
 F:      include/linux/fs_enet_pd.h
 
 FREESCALE QUICC ENGINE LIBRARY
-M:      Timur Tabi <timur@freescale.com>
 L:      linuxppc-dev@lists.ozlabs.org
-S:      Supported
+S:      Orphan
 F:      arch/powerpc/sysdev/qe_lib/
 F:      arch/powerpc/include/asm/*qe.h
 
@@ -3241,16 +3248,16 @@ S:	Maintained
 F:      drivers/net/ethernet/freescale/ucc_geth*
 
 FREESCALE QUICC ENGINE UCC UART DRIVER
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      linuxppc-dev@lists.ozlabs.org
-S:      Supported
+S:      Maintained
 F:      drivers/tty/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
-M:      Timur Tabi <timur@freescale.com>
+M:      Timur Tabi <timur@tabi.org>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:      linuxppc-dev@lists.ozlabs.org
-S:      Supported
+S:      Maintained
 F:      sound/soc/fsl/fsl*
 F:      sound/soc/fsl/mpc8610_hpcd.c
 
@@ -5077,7 +5084,7 @@ S:	Maintained
 F:      drivers/media/radio/radio-mr800.c
 
 MSI LAPTOP SUPPORT
-M:      "Lee, Chun-Yi" <jlee@novell.com>
+M:      "Lee, Chun-Yi" <jlee@suse.com>
 L:      platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/msi-laptop.c
@@ -5507,8 +5514,7 @@ M:	Benoît Cousson <b-cousson@ti.com>
 M:      Paul Walmsley <paul@pwsan.com>
 L:      linux-omap@vger.kernel.org
 S:      Maintained
-F:      arch/arm/mach-omap2/omap_hwmod.c
-F:      arch/arm/plat-omap/include/plat/omap_hwmod.h
+F:      arch/arm/mach-omap2/omap_hwmod.*
 
 OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
 M:      Benoît Cousson <b-cousson@ti.com>
@@ -7082,7 +7088,7 @@ F:	include/uapi/sound/
 F:      sound/
 
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
-M:      Liam Girdwood <lrg@ti.com>
+M:      Liam Girdwood <lgirdwood@gmail.com>
 M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -7334,7 +7340,7 @@ S:	Odd Fixes
 F:      drivers/staging/speakup/
 
 STAGING - TI DSP BRIDGE DRIVERS
-M:      Omar Ramirez Luna <omar.ramirez@ti.com>
+M:      Omar Ramirez Luna <omar.ramirez@copitl.com>
 S:      Odd Fixes
 F:      drivers/staging/tidspbridge/
 
@@ -8526,7 +8532,7 @@ F:	Documentation/x86/
 F:      arch/x86/
 
 X86 PLATFORM DRIVERS
-M:      Matthew Garrett <mjg@redhat.com>
+M:      Matthew Garrett <matthew.garrett@nebula.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