From: Linus Torvalds Date: Sat, 6 Dec 2014 19:27:25 +0000 (-0800) Subject: Merge git://www.linux-watchdog.org/linux-watchdog X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19b022572b9e0fa8ce5490db888714ecb2b1293e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge git://www.linux-watchdog.org/linux-watchdog Pull watchdog fix from Wim Van Sebroeck: "Fix the watchdog mask bit offset for Exynos7" * git://www.linux-watchdog.org/linux-watchdog: watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7 --- 19b022572b9e0fa8ce5490db888714ecb2b1293e