From: Linus Torvalds Date: Fri, 2 Mar 2012 02:27:43 +0000 (-0800) Subject: Merge git://www.linux-watchdog.org/linux-watchdog X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f033c1a6ec1a6815e9c4507d83eb20161163c37;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge git://www.linux-watchdog.org/linux-watchdog Watchdog updates from Wim Van Sebroeck: * git://www.linux-watchdog.org/linux-watchdog: watchdog: fix GETTIMEOUT ioctl in booke_wdt watchdog: update maintainers git entry watchdog: Fix typo in pnx4008_wdt.c watchdog: Fix typo in Kconfig watchdog: fix error in probe() of s3c2410_wdt (reset at booting) watchdog: hpwdt: clean up set_memory_x call for 32 bit --- 1f033c1a6ec1a6815e9c4507d83eb20161163c37