From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 14 Mar 2007 22:28:31 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.21-rc4~7
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=0bdd0f385a44344f83409b9e00797bfe2596faf8;p=safe%2Fjmp%2Flinux-2.6

Merge /linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] i8xx TCO driver - mark for removal
---

0bdd0f385a44344f83409b9e00797bfe2596faf8