Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Dec 2014 19:27:25 +0000 (11:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Dec 2014 19:27:25 +0000 (11:27 -0800)
commit19b022572b9e0fa8ce5490db888714ecb2b1293e
treeaccc2ff5dee2b2062aeda1361cf0adb30d5146f6
parent15bd1e5cb36306a015328aa1c2b6470a25153171
parent5476b2b77dae50c88aa6a85f21abeac38dde590f
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