From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Dec 2011 20:13:03 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: upstream/snapshot3+hdmi~8489
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=995b4103a78b9bef0ff834f9ecac42b2b56e01a8;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: iTCO_wdt.c - problems with newer hardware due to SMI clearing (part 2)
  watchdog: hpwdt: Changes to handle NX secure bit in 32bit path
  watchdog: sp805: Fix section mismatch in ID table.
  watchdog: move coh901327 state holders
---

995b4103a78b9bef0ff834f9ecac42b2b56e01a8