tree 603daa5e21ca27db85350a0b5a55a77a72e412c4
parent 353cefdb33929bd5d925d59060be11759cee8f52
parent 1bef84bea273f40486936ae97cda70ee8b252cd0
author Linus Torvalds <torvalds@g5.osdl.org> 1159908524 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159908524 -0700

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 shutdown patch
  [WATCHDOG] iTCO_wdt.c - pci_dev_put fix
  [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver
  [WATCHDOG] iTCO_wdt (Intel TCO Timer) driver