commit 14e71e4fb94c340273534a6d7f210aa82a3ca717
author Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 06 09:56:40 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 06 09:56:40 2010 -0700
tree 668c4ebb39e94755835364d2ba16615ae8c4ec82
parent ab195c58b864802c15e494f06ae109413e12d50b
parent 8ba42bd88c6982fe224b09c33151c797b0fdf1a5

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] hpwdt - fix lower timeout limit
  [WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs
  [WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.
  [WATCHDOG] doc: watchdog simple example: don't fail on fsync()
  [WATCHDOG] set max63xx driver as ARM only
  [WATCHDOG] powerpc: pika_wdt ident cannot be const