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)
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


Trivial merge