From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Dec 2014 19:27:25 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19b022572b9e0fa8ce5490db888714ecb2b1293e;p=pandora-kernel.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