tree 206150fd9ad2669c8f62a05d32fa3679949da65c
parent 5d43a1de26f37080b75d7c0cf2a0b97523457568
parent 0a6bf658c3b9d1d0e520d320b6392c8680c2e381
author Linus Torvalds <torvalds@linux-foundation.org> 1292362586 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292362586 -0800

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