Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  hwmon: Add Asus ATK0110 support
  hwmon: (lm95241) Convert to new-style i2c driver

diff --combined drivers/hwmon/Kconfig
index 9b17dffc1c01f61cbd851f0788de124961ba90ab,6c0f1bad8821ec3406666e2c4a516baaa5927535..0e8a9185f676fa6ade83113b983a7e6430e52739
--- 1/drivers/hwmon/Kconfig
--- 2/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -248,6 -248,18 +248,18 @@@ config SENSORS_ASB10
          This driver can also be built as a module.  If so, the module
          will be called asb100.
  
+ config SENSORS_ATK0110
+       tristate "ASUS ATK0110 ACPI hwmon"
+       depends on X86 && ACPI && EXPERIMENTAL
+       help
+         If you say yes here you get support for the ACPI hardware
+         monitoring interface found in many ASUS motherboards. This
+         driver will provide readings of fans, voltages and temperatures
+         through the system firmware.
+ 
+         This driver can also be built as a module. If so, the module
+         will be called asus_atk0110.
+ 
  config SENSORS_ATXP1
        tristate "Attansic ATXP1 VID controller"
        depends on I2C && EXPERIMENTAL
@@@ -358,16 -370,6 +370,16 @@@ config SENSORS_FSCHM
          This driver can also be built as a module.  If so, the module
          will be called fschmd.
  
 +config SENSORS_G760A
 +      tristate "GMT G760A"
 +      depends on I2C
 +      help
 +        If you say yes here you get support for Global Mixed-mode
 +        Technology Inc G760A fan speed PWM controller chips.
 +
 +        This driver can also be built as a module.  If so, the module
 +        will be called g760a.
 +
  config SENSORS_GL518SM
        tristate "Genesys Logic GL518SM"
        depends on I2C

diff --combined drivers/hwmon/Makefile
index 96dc7f9439d22ebe87fc6088bca2be2ea4e0bb1c,556855b09037e0e82fbc06fba48221ad77f3db19..1d3757837b4ff5091f4ae2d6728616f9ec7aee1a
--- 1/drivers/hwmon/Makefile
--- 2/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -32,6 -32,7 +32,7 @@@ obj-$(CONFIG_SENSORS_ADT7475) += adt747
  
  obj-$(CONFIG_SENSORS_APPLESMC)        += applesmc.o
  obj-$(CONFIG_SENSORS_AMS)     += ams/
+ obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o
  obj-$(CONFIG_SENSORS_ATXP1)   += atxp1.o
  obj-$(CONFIG_SENSORS_CORETEMP)        += coretemp.o
  obj-$(CONFIG_SENSORS_DME1737) += dme1737.o
@@@ -42,7 -43,6 +43,7 @@@ obj-$(CONFIG_SENSORS_F75375S) += f75375
  obj-$(CONFIG_SENSORS_FSCHER)  += fscher.o
  obj-$(CONFIG_SENSORS_FSCHMD)  += fschmd.o
  obj-$(CONFIG_SENSORS_FSCPOS)  += fscpos.o
 +obj-$(CONFIG_SENSORS_G760A)   += g760a.o
  obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
  obj-$(CONFIG_SENSORS_GL520SM) += gl520sm.o
  obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o