tree 9b31e9522e936440c0feaeb1e3b4ccd673804b45
parent 016d3569bf7b21375451d91be6ee2ad4ffff5211
parent cf1eaab2525e8ae1d53eaf923981c96cb31e57c8
author Linus Torvalds <torvalds@linux-foundation.org> 1247197501 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1247197501 -0700

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] w83627hf_wdt.c: add support for the W83627EHF support
  [WATCHDOG] SA1100 watchdog maximum timeout
  [WATCHDOG] w83697ug, fix lock imbalance
  [WATCHDOG] drivers/watchdog/bcm47xx_wdt.c: Remove unnecessary semicolons