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)
commit0bdd0f385a44344f83409b9e00797bfe2596faf8
tree2f01d7bee085a02e147061c8e1d7b131478b4d8d
parent69300436ca382a4753044142ae3a2c8099e70215
parentab97e6cf7be77d1a9ae48d1d0eafde0de21805fc
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