From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Jan 2010 03:00:56 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v3.0~6145
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c799d15333ff52a3f19ca926636a7774a16cca58;p=platform%2Fkernel%2Flinux-amlogic.git

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
---

c799d15333ff52a3f19ca926636a7774a16cca58