tree 7a1c32af08c3eb559154f2340431b8de178b167b
parent 474a503d4bf77ae0cbe484dd0842a2648c0b1c28
parent 384e724b6b396de32c1e9cb0b7ccdd011bcc2beb
author Linus Torvalds <torvalds@linux-foundation.org> 1255285413 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255285413 -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: (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