From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jul 2009 21:31:13 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: Ubuntu-5.2.0-15.16~28585
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d;p=mirror_ubuntu-eoan-kernel.git

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: (asus_atk0110) Fix upper limit readings
  hwmon: (smsc47m1) Differentiate between LPC47M233 and LPC47M292
---

7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d