Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

58a2c322 · Linus Torvalds · dcbd39a1 · 195331d7 · 58a2c322
Commit 58a2c322 authored Oct 08, 2005 by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 172 additions and 67 deletions

drivers/char/watchdog/pcwd_pci.c drivers/char/watchdog/pcwd_pci.c +172 -67

No files found.
--- a/drivers/char/watchdog/pcwd_pci.c
+++ b/drivers/char/watchdog/pcwd_pci.c