Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commit0e016b9fa134d79341cca5e336ccbcea066d5f81
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:29:57 +0000 (1 21:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:29:57 +0000 (1 21:29 -0800)
tree2f0b00b0dd43faaa385779c3c33b2c98b253863a
parentfca324e79fa30d4e64ac15554601a86392999ae6
parentde4ae58fc9f46482f96306301011dfc8b404491f
Merge /linux/kernel/git/wim/linux-2.6-watchdog