diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-28 14:31:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-28 14:31:13 -0700 |
| commit | 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d (patch) | |
| tree | 50919af840b007509cd961870dbf59e13c2b139f /fs/locks.c | |
| parent | ddb1d4ede9c8acd2e20ac99bf2b68146ae9f3553 (diff) | |
| parent | 8d282497cbf8124d6814d51a74fb13d69531c669 (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: (asus_atk0110) Fix upper limit readings
hwmon: (smsc47m1) Differentiate between LPC47M233 and LPC47M292
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions