Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2010 22:20:15 +0000 (14:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jan 2010 22:20:15 +0000 (14:20 -0800)
commit24bc7347da73a9ed3383056c3d0f28c0e361621e
tree486211383b2f6bded1c0f24fe72130d2f2ffb65d
parentbb668da6d6f2bec8a63838c098d9515eccb22cc4
parent3c9d8eccd8687f0e770e4d89fd0d73d4f81a985a
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] iTCO_wdt: Add Intel Cougar Point and PCH DeviceIDs