Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cda045337a9d319eca95e6b297d983b54085344a..0ed7048352b56a98155ca8cd4e6f30aa879dbe4a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
@@ -6965,6 +6965,13 @@ S:       Maintained
 F:     Documentation/filesystems/ufs.txt
 F:     fs/ufs/
 
+UHID USERSPACE HID IO DRIVER:
+M:     David Herrmann <dh.herrmann@googlemail.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/uhid.c
+F:     include/linux/uhid.h
+
 ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 L:     linux-usb@vger.kernel.org
 S:     Orphan
@@ -7225,9 +7232,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