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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-11-01 21:29:57 -08:00

parent fca324e79f de4ae58fc9

commit 0e016b9fa1

5 changed files with 8 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/char/watchdog/mpcore_wdt.c

View file

1

drivers/char/watchdog/mv64x60_wdt.c

View file

6

drivers/char/watchdog/pcwd_pci.c

View file

1

drivers/char/watchdog/s3c2410_wdt.c

View file

2

drivers/char/watchdog/w83627hf_wdt.c

View file