From: Linus Torvalds <torvalds@evo.osdl.org>
Date: Mon, 5 Sep 2005 13:00:45 +0000 (-0700)
Subject: Merge watchdog driver updates
X-Git-Tag: v2.6.14-rc1~771
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67d2c36e901403bb97cb79ddb44d702c3284d0ba;p=pandora-kernel.git

Merge watchdog driver updates

Automated merge from

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

failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
---

67d2c36e901403bb97cb79ddb44d702c3284d0ba
Reading git-diff-tree failed