]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 20:48:44 +0000 (13:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 20:48:44 +0000 (13:48 -0700)
commit2fee7b18453d6a7e9ee2db0c7f7eec30f6898166
tree603daa5e21ca27db85350a0b5a55a77a72e412c4
parent353cefdb33929bd5d925d59060be11759cee8f52
parent1bef84bea273f40486936ae97cda70ee8b252cd0
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