Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 12 Feb 2006 18:26:57 +0000 (10:26 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 12 Feb 2006 18:26:57 +0000 (10:26 -0800)
commitd524c5e200486d55942fcd25b0b6e181f843f837
treede36710d694c9deb7a167d0da28de43835bd4577
parent19bf9cbf6b313ae79a0c7278ccaa9c72c86931bd
parenta7122f916978a6cd58b765949cb315aabcddf151
Merge /linux/kernel/git/wim/linux-2.6-watchdog