]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:36:26 +0000 (13:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Dec 2010 21:36:26 +0000 (13:36 -0800)
commitb922eab1f19275dd6ae9d7e0de0f0e0386ef937e
tree206150fd9ad2669c8f62a05d32fa3679949da65c
parentd8c00ee8833aede8cfd193006ee475ba0ac4aa7e
parent712227f692d7728900460a418c7a134697ececd5
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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