Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commit5bdeae46be6dfe9efa44a548bd622af325f4bdb4
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jan 2008 22:36:35 +0000 (31 09:36 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jan 2008 22:36:35 +0000 (31 09:36 +1100)
treeae9d2dd31a35c70d9928498cc8271230838f030c
parentd145c7253c8cb2ed8a75a8839621b0bb8f778820
parent1ceea8243aa917ac7fc5a4a6585dea4789f7c20f
Merge git://git./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