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

Pull trivial tree from Jiri Kosina:
 "Trivial updates all over the place as usual."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
  Fix typo in include/linux/clk.h .
  pci: hotplug: Fix typo in pci
  iommu: Fix typo in iommu
  video: Fix typo in drivers/video
  Documentation: Add newline at end-of-file to files lacking one
  arm,unicore32: Remove obsolete "select MISC_DEVICES"
  module.c: spelling s/postition/position/g
  cpufreq: Fix typo in cpufreq driver
  trivial: typo in comment in mksysmap
  mach-omap2: Fix typo in debug message and comment
  scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
  Change email address for Steve Glendinning
  Btrfs: fix typo in convert_extent_bit
  via: Remove bogus if check
  netprio_cgroup.c: fix comment typo
  backlight: fix memory leak on obscure error path
  Documentation: asus-laptop.txt references an obsolete Kconfig item
  Documentation: ManagementStyle: fixed typo
  mm/vmscan: cleanup comment error in balance_pgdat
  mm: cleanup on the comments of zone_reclaim_stat
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 04ea1f23756f..0ed7048352b5 100644
--- 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
@@ -7232,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