]> git.proxmox.com Git - mirror_ubuntu-eoan-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)
commitdc99bf78238a7554578a319d8fd06655151121a3
tree206150fd9ad2669c8f62a05d32fa3679949da65c
parent5d43a1de26f37080b75d7c0cf2a0b97523457568
parent0a6bf658c3b9d1d0e520d320b6392c8680c2e381
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