From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 20 Sep 2011 17:24:46 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v3.1-rc7~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d006de93531a9876b26919e9d2bbf562654ab736;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge git://www.linux-watchdog.org/linux-watchdog

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Initconst section fixes for watchdog
  watchdog: lantiq: fix watchdogs timeout handling
  watchdog: hpwdt: prevent multiple "NMI occurred" messages
  watchdog: WatchDog Timer Driver Core - use passed watchdog_device
---

d006de93531a9876b26919e9d2bbf562654ab736