Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 23:05:43 +0000 (16:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 23:05:43 +0000 (16:05 -0700)
commitc5b7bede71853d92fc747cdc12fa5234b6045731
tree922284456a74150e679126e73551b64ba9c00bf2
parentfb2c922b8588115d8914492493a37109bfb07884
parent5c34202b8bf942da411b6599668a76b07449bbfd
Merge /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