tree dcbb5da853601a2e80829402adbd03435469eb10
parent ee433530d96a7b0af24ab616e5b51f1d89f9ae38
parent 655516c80ccb3ab2ba2d3063715889b00552a8b3
author Linus Torvalds <torvalds@g5.osdl.org> 1148082119 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1148082119 -0700

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] s3c2410_wdt.c stop watchdog after boot
  [WATCHDOG] i8xx_tco.c - remove support for ICH6 + ICH7
  [WATCHDOG] Documentation/watchdog/watchdog-api.txt - fix watchdog daemon
  [WATCHDOG] sc1200wdt.c printk fix