From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 11 Oct 2009 18:23:33 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4c274fff4fa03cf2509e1b01d3712de6131bfa50;p=linux-beck.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: (s3c-hwmon) Disable build for S3C64xx
  MAINTAINERS: Fix Riku Voipio's address
  hwmon: (asus_atk0110) Enable the EC
  hwmon: (asus_atk0110) Refactor the code
  hwmon: (sht15) Fix spurious section mismatch warning
---

4c274fff4fa03cf2509e1b01d3712de6131bfa50