Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 19 Feb 2007 22:16:51 +0000 (14:16 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 19 Feb 2007 22:16:51 +0000 (14:16 -0800)
commit2aa6eb313e57a8254b17e60b8bb5e0a2570d7776
tree0e775fe39ef50f873264e2bd444da78a95f08684
parentcb553c480078759014096bc766dc76400e1d8397
parent420cff550fb1338bc946f1ccc8bb66f2d96ad1cb
Merge /linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] machzwd warning fix