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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (s3c-hwmon) Disable build for S3C64xx
  MAINTAINERS: Fix Riku Voipio's address
  hwmon: (asus_atk0110) Enable the EC
  hwmon: (asus_atk0110) Refactor the code
  hwmon: (sht15) Fix spurious section mismatch warning

diff --combined MAINTAINERS
index 6141bdf,16c51fc..69e31aa
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1231,13 -1231,6 +1231,13 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/tg3.*
  
 +BROCADE BFA FC SCSI DRIVER
 +P:      Jing Huang
 +M:      huangj@brocade.com
 +L:      linux-scsi@vger.kernel.org
 +S:      Supported
 +F:      drivers/scsi/bfa/
 +
  BSG (block layer generic sg v4 driver)
  M:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
  L:    linux-scsi@vger.kernel.org
@@@ -2065,7 -2058,7 +2065,7 @@@ S:      Maintaine
  F:    fs/*
  
  FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
- M:    Riku Voipio <riku.vipio@iki.fi>
+ M:    Riku Voipio <riku.voipio@iki.fi>
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  F:    drivers/hwmon/f75375s.c
@@@ -4653,14 -4646,6 +4653,14 @@@ F:    drivers/ata
  F:    include/linux/ata.h
  F:    include/linux/libata.h
  
 +SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 +P:     Jayamohan Kallickal
 +M:     jayamohank@serverengines.com
 +L:     linux-scsi@vger.kernel.org
 +W:     http://www.serverengines.com
 +S:     Supported
 +F:     drivers/scsi/be2iscsi/
 +
  SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
  M:    Sathya Perla <sathyap@serverengines.com>
  M:    Subbu Seetharaman <subbus@serverengines.com>

diff --combined drivers/hwmon/sht15.c
index 2da6fb2,64bd6e5..ebe38b6
--- 1/drivers/hwmon/sht15.c
--- 2/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@@ -30,7 -30,6 +30,7 @@@
  #include <linux/hwmon-sysfs.h>
  #include <linux/mutex.h>
  #include <linux/platform_device.h>
 +#include <linux/sched.h>
  #include <linux/delay.h>
  #include <linux/jiffies.h>
  #include <linux/err.h>
@@@ -623,7 -622,12 +623,12 @@@ static int __devexit sht15_remove(struc
  }
  
  
- static struct platform_driver sht_drivers[] = {
+ /*
+  * sht_drivers simultaneously refers to __devinit and __devexit function
+  * which causes spurious section mismatch warning. So use __refdata to
+  * get rid from this.
+  */
+ static struct platform_driver __refdata sht_drivers[] = {
        {
                .driver = {
                        .name = "sht10",