Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 8 Oct 2005 21:58:25 +0000 (14:58 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 8 Oct 2005 21:58:25 +0000 (14:58 -0700)
commit58a2c3221e3c78ea6c71148eb84d4170358981fb
tree8d922766f438081b9721ed33b6c446a0b22858d1
parentdcbd39a1f1073b10debdb965fccc0ab806d59780
parent195331d7c9813fe7f1a93c09afa2c7dcdf2790a8
Merge /linux/kernel/git/wim/linux-2.6-watchdog