tree d285d0396e9f7b9496976c6845910c04472e159c
parent 61420f59a589c0668f70cbe725785837c78ece90
parent 006948bafece27265dce72d3158b12af3ff67fce
author Linus Torvalds <torvalds@linux-foundation.org> 1231012753 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231012753 -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] Add support for the WM8350 watchdog
  [WATCHDOG] Add SMSC SCH311x Watchdog Timer.
  [WATCHDOG] ib700wdt - add timeout parameter