commit 980110c5da56cb56d3356f5a5251fdc920f83ba6
author Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Dec 17 09:53:51 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Dec 17 09:53:51 2007 -0800
tree e435f3c3b69cae3ffebf780c0a905b92ccd3289d
parent 5cdddecc8b423308798453484149297a503e9cc0
parent c4c283357d865aad1f124c069f5f6e3f39e76790

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 Nano 7240 driver
  [WATCHDOG] ipmi: add the standard watchdog timeout ioctls
  [WATCHDOG] IT8212F watchdog driver
  [WATCHDOG] Sbus: cpwatchdog, remove SPIN_LOCK_UNLOCKED
  [WATCHDOG] bfin_wdt, remove SPIN_LOCK_UNLOCKED
  [WATCHDOG] Stop looking for device as soon as one is found
  [WATCHDOG] at32ap700x_wdt: add support for boot status and add fix for silicon errata