Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

This commit is contained in:
Greg Kroah-Hartman 2006-08-16 01:38:39 -07:00
commit ca412cc992