Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Mar 2007 22:28:31 +0000 (15:28 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 14 Mar 2007 22:28:31 +0000 (15:28 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] i8xx TCO driver - mark for removal


Trivial merge