diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:05:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 16:05:43 -0700 |
commit | c5b7bede71853d92fc747cdc12fa5234b6045731 (patch) | |
tree | 922284456a74150e679126e73551b64ba9c00bf2 /drivers/net/atp.h | |
parent | fb2c922b8588115d8914492493a37109bfb07884 (diff) | |
parent | 5c34202b8bf942da411b6599668a76b07449bbfd (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] iTCO_wdt.c - fix ACPI Base register
Diffstat (limited to 'drivers/net/atp.h')
0 files changed, 0 insertions, 0 deletions