tree e0851c336111141d1537d9e9fe57f443661f53d1
parent 51eaaa677691f8da526ce5a3d89e08ee2d2669ce
parent 290172e79036fc25a22aaf3da4835ee634886183
author Linus Torvalds <torvalds@linux-foundation.org> 1228262300 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228262300 -0800

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] hpwdt: Fix kdump when using hpwdt
  [WATCHDOG] hpwdt: set the mapped BIOS address space as executable
  [WATCHDOG] iTCO_wdt: add PCI ID's for ICH9 & ICH10 chipsets
  [WATCHDOG] iTCO_wdt : correct status clearing
  [WATCHDOG] iTCO_wdt : problem with rebooting on new ICH9 based motherboards
  [WATCHDOG] fix mtx1_wdt compilation failure