From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Dec 2010 21:36:26 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v2.6.37-rc6~20
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=dc99bf78238a7554578a319d8fd06655151121a3

Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (ltc4215) make sysfs file match the alarm cause
---

dc99bf78238a7554578a319d8fd06655151121a3