From: Linus Torvalds 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: firefly_0821_release~23627 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5bdeae46be6dfe9efa44a548bd622af325f4bdb4;p=firefly-linux-kernel-4.4.55.git 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 --- 5bdeae46be6dfe9efa44a548bd622af325f4bdb4