From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 11 May 2007 23:05:43 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.22-rc1~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c5b7bede71853d92fc747cdc12fa5234b6045731;p=linux-2.6-omap-h63xx.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] iTCO_wdt.c - fix ACPI Base register
---

c5b7bede71853d92fc747cdc12fa5234b6045731