From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jul 2009 03:45:01 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.31-rc3~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b690a3770e99497982d48a93e30cb7de549aead8;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] w83627hf_wdt.c: add support for the W83627EHF support
  [WATCHDOG] SA1100 watchdog maximum timeout
  [WATCHDOG] w83697ug, fix lock imbalance
  [WATCHDOG] drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons
---

b690a3770e99497982d48a93e30cb7de549aead8