From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Jan 2010 22:20:15 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.33-rc5~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=24bc7347da73a9ed3383056c3d0f28c0e361621e;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs
---

24bc7347da73a9ed3383056c3d0f28c0e361621e