tree b9362ca16a3670a67dcc05fdaf0162aa2e470c5f
parent 80214df8db6d0ba8172f70122705ef29077fd918
parent bc482bf0ce918b39a1fa60b9341f1add9318d833
author Linus Torvalds <torvalds@linux-foundation.org> 1284744347 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1284744347 -0700

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (lm95241) Replace rate sysfs attribute with update_interval
  hwmon: (adm1031) Replace update_rate sysfs attribute with update_interval
  hwmon: (w83627ehf) Use proper exit sequence
  hwmon: (emc1403) Remove unnecessary hwmon_device_unregister
  hwmon: (f75375s) Do not overwrite values read from registers
  hwmon: (f75375s) Shift control mode to the correct bit position
  hwmon: New subsystem maintainers
  hwmon: (lis3lv02d) Prevent NULL pointer dereference