commit | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 31 09:36:35 2008 +1100 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 31 09:36:35 2008 +1100 |
tree | ae9d2dd31a35c70d9928498cc8271230838f030c | |
parent | d145c7253c8cb2ed8a75a8839621b0bb8f778820 [diff] | |
parent | 1ceea8243aa917ac7fc5a4a6585dea4789f7c20f [diff] |
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