From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 30 Jan 2008 22:36:35 +0000 (+1100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.25-rc1~1134
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5bdeae46be6dfe9efa44a548bd622af325f4bdb4;p=linux-2.6-omap-h63xx.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] use SGI_HAS_INDYDOG for INDYDOG depends
---

5bdeae46be6dfe9efa44a548bd622af325f4bdb4