Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Jan 2009 19:59:13 +0000 (11:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Jan 2009 19:59:13 +0000 (11:59 -0800)
commitad6b646fe55c40ec193240b974561f0a3775d68d
treed285d0396e9f7b9496976c6845910c04472e159c
parent61420f59a589c0668f70cbe725785837c78ece90
parent006948bafece27265dce72d3158b12af3ff67fce
Merge git://git./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