| commit | dc99bf78238a7554578a319d8fd06655151121a3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 13:36:26 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 14 13:36:26 2010 -0800 |
| tree | 206150fd9ad2669c8f62a05d32fa3679949da65c | |
| parent | 5d43a1de26f37080b75d7c0cf2a0b97523457568 [diff] | |
| parent | 0a6bf658c3b9d1d0e520d320b6392c8680c2e381 [diff] |
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