From: Linus Torvalds Date: Sat, 3 Jan 2009 19:59:13 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~28517 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ad6b646fe55c40ec193240b974561f0a3775d68d;p=mirror_ubuntu-artful-kernel.git 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] Add support for the WM8350 watchdog [WATCHDOG] Add SMSC SCH311x Watchdog Timer. [WATCHDOG] ib700wdt - add timeout parameter --- ad6b646fe55c40ec193240b974561f0a3775d68d