Merge branch 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[profile/ivi/kernel-adaptation-intel-automotive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 04ea1f2..9b8a5da 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5210,7 +5210,7 @@ PCI SUBSYSTEM
 M:     Bjorn Helgaas <bhelgaas@google.com>
 L:     linux-pci@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-pci/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 S:     Supported
 F:     Documentation/PCI/
 F:     drivers/pci/
@@ -6242,9 +6242,9 @@ F:        Documentation/hwmon/smm665
 F:     drivers/hwmon/smm665.c
 
 SMSC EMC2103 HARDWARE MONITOR DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     lm-sensors@lm-sensors.org
-S:     Supported
+S:     Maintained
 F:     Documentation/hwmon/emc2103
 F:     drivers/hwmon/emc2103.c
 
@@ -6263,22 +6263,22 @@ F:      Documentation/hwmon/smsc47b397
 F:     drivers/hwmon/smsc47b397.c
 
 SMSC911x ETHERNET DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     include/linux/smsc911x.h
 F:     drivers/net/ethernet/smsc/smsc911x.*
 
 SMSC9420 PCI ETHERNET DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     drivers/net/ethernet/smsc/smsc9420.*
 
 SMSC UFX6000 and UFX7000 USB to VGA DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     linux-fbdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     drivers/video/smscufx.c
 
 SN-IA64 (Itanium) SUB-PLATFORM
@@ -6765,9 +6765,11 @@ F:       include/linux/tifm.h
 
 TI LM49xxx FAMILY ASoC CODEC DRIVERS
 M:     M R Swami Reddy <mr.swami.reddy@ti.com>
+M:     Vishwas A Deshpande <vishwas.a.deshpande@ti.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/lm49453*
+F:     sound/soc/codecs/isabelle*
 
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
@@ -7232,9 +7234,9 @@ S:        Supported
 F:     drivers/usb/serial/whiteheat*
 
 USB SMSC95XX ETHERNET DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     drivers/net/usb/smsc95xx.*
 
 USB SN9C1xx DRIVER
@@ -7603,6 +7605,7 @@ W:        http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
 S:     Supported
 F:     Documentation/hwmon/wm83??
 F:     arch/arm/mach-s3c64xx/mach-crag6410*
+F:     drivers/clk/clk-wm83*.c
 F:     drivers/leds/leds-wm83*.c
 F:     drivers/hwmon/wm83??-hwmon.c
 F:     drivers/input/misc/wm831x-on.c