From: Linus Torvalds Date: Fri, 19 May 2006 23:41:59 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Tag: v2.6.17-rc5~94 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b0c51b7d650d5109c8e71e19d5e7ce9b71af7dff;p=linux-2.6-omap-h63xx.git 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 --- b0c51b7d650d5109c8e71e19d5e7ce9b71af7dff