From: Linus Torvalds Date: Mon, 14 Mar 2011 17:15:43 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Tag: firefly_0821_release~7613^2~2258 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=786c58b7275ae885a3cee9d5bcf8721d962861ac;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: hpwdt: eliminate section mismatch warning watchdog: w83697ug_wdt: Fix set bit 0 to activate GPIO2 watchdog: sch311x_wdt: fix printk condition watchdog: sch311x_wdt: Fix LDN active check watchdog: cpwd: Fix buffer-overflow --- 786c58b7275ae885a3cee9d5bcf8721d962861ac