From: Linus Torvalds Date: Thu, 2 Dec 2010 20:11:31 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e5c26de1d9a8e824b6c098ee393edac1b6050f9;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.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: it8712f_wdt: add note to Kconfig watchdog: gef_wdt: include fs.h watchdog: bcm63xx_wdt: improve platform part. watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH --- 2e5c26de1d9a8e824b6c098ee393edac1b6050f9