diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-09 21:23:54 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-09 21:23:54 +0200 |
commit | 07f405541892bd9bab4cca6c12499091ef4dd556 (patch) | |
tree | 54f85f9314716275e46882c47cfe75541371bc22 /fs/splice.c | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/c... (diff) | |
parent | hwmon: (abituguru3) Enable DMI probing feature on Abit AT8 32X (diff) | |
download | linux-07f405541892bd9bab4cca6c12499091ef4dd556.tar.xz linux-07f405541892bd9bab4cca6c12499091ef4dd556.zip |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon: (abituguru3) Enable DMI probing feature on Abit AT8 32X
hwmon: (abituguru3) Enable reading from AUX3 fan on Abit AT8 32X
hwmon: (adt7473) Fix some bogosity in documentation file
hwmon: Define sysfs interface for energy consumption register
hwmon: (it87) Prevent power-off on Shuttle SN68PT
eeepc-laptop: Fix hwmon interface
Diffstat (limited to 'fs/splice.c')
0 files changed, 0 insertions, 0 deletions