Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
commitc799d15333ff52a3f19ca926636a7774a16cca58
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jan 2010 03:00:56 +0000 (25 19:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jan 2010 03:00:56 +0000 (25 19:00 -0800)
tree0b0cdb1665aad0ff215a8297cf7af64e63a97f57
parentabefedd538f57f63199d821ade33f282e7fe0921
parentc453615f77aa51593c1c9c9031b4278797d3fd19
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog
  hwmon: (asus_atk0110) Do not fail if MBIF is missing
  hwmon: (amc6821) Double unlock bug
  hwmon: (smsc47m1) Fix section mismatch