From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Sep 2009 14:24:42 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.32-rc1~26
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c09c2d1089b55a3da7058a2f1a76c2f21c8b0688;p=~shefty%2Frdma-dev.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] Add support for the Avionic Design Xanthos watchdog timer.
---

c09c2d1089b55a3da7058a2f1a76c2f21c8b0688