tree accc2ff5dee2b2062aeda1361cf0adb30d5146f6
parent 15bd1e5cb36306a015328aa1c2b6470a25153171
parent 5476b2b77dae50c88aa6a85f21abeac38dde590f
author Linus Torvalds <torvalds@linux-foundation.org> 1417894045 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1417894045 -0800

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