commit | ee49a277e6daaa52e846be264246bd809d2c5fff | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 17 09:17:40 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 17 09:17:40 2009 -0800 |
tree | 22d6ceead923e9bb8192e7fe7c1a05bdd51d2977 | |
parent | 3026a9b0515976f06ff49705d6f642b671731aac [diff] | |
parent | 84d2a314bbe440d7c2e8636a1923aa3ea1aca51b [diff] |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: hwmon: (adt7475) Fix sysfs file names hwmon: (adt7475) Cache limits for 60 seconds hwmon: (adt7475) Fix temperature fault flags hwmon: (s3c-hwmon) Ignore invalid divider settings