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: (abituguru3) Fix CONFIG_DMI=n fallback to probe
  hwmon: (abituguru3) Enable DMI probing feature on IN9 32X MAX
  hwmon: (abituguru3) Match partial DMI board name strings
  hwmon: Add a driver for the ADT7475 hardware monitoring chip
  hwmon: (k8temp) Fix temperature reporting for (most) K8 RevG CPUs
  hwmon: (k8temp) Fix wrong sensor selection for AMD K8 RevF/RevG CPUs
  hwmon: (k8temp) Warn about fam F rev F errata

diff --combined drivers/hwmon/Kconfig
index 54b43bea5e479ab186b6a8a7840246ba29ceff90,5c349a19a3a33eec6af073dc99624d0f7803dcac..b84bf066879b6c177bde4efd79aa2bde480faa60
--- 1/drivers/hwmon/Kconfig
--- 2/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -189,6 -189,16 +189,16 @@@ config SENSORS_ADT747
          This driver can also be built as a module. If so, the module
          will be called adt7473.
  
+ config SENSORS_ADT7475
+       tristate "Analog Devices ADT7475"
+       depends on I2C && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Analog Devices
+         ADT7475 hardware monitoring chips.
+ 
+         This driver can also be build as a module.  If so, the module
+         will be called adt7475.
+ 
  config SENSORS_K8TEMP
        tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on X86 && PCI && EXPERIMENTAL
@@@ -861,8 -871,6 +871,8 @@@ config SENSORS_HDAP
  config SENSORS_LIS3LV02D
        tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer"
        depends on ACPI && INPUT
 +      select NEW_LEDS
 +      select LEDS_CLASS
        default n
        help
          This driver provides support for the LIS3LV02Dx accelerometer. In
@@@ -874,16 -882,10 +884,16 @@@
          /sys/devices/platform/lis3lv02d.
  
          This driver also provides an absolute input class device, allowing
 -        the laptop to act as a pinball machine-esque joystick.
 +        the laptop to act as a pinball machine-esque joystick. On HP laptops,
 +        if the led infrastructure is activated, support for a led indicating
 +        disk protection will be provided as hp:red:hddprotection.
  
 -        This driver can also be built as a module.  If so, the module
 -        will be called lis3lv02d.
 +        This driver can also be built as modules.  If so, the core module
 +        will be called lis3lv02d and a specific module for HP laptops will be
 +        called hp_accel.
 +
 +        Say Y here if you have an applicable laptop and want to experience
 +        the awesome power of lis3lv02d.
  
  config SENSORS_APPLESMC
        tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"