Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 08:38:39 +0000 (01:38 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 08:38:39 +0000 (01:38 -0700)

Trivial merge