]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 16:56:40 +0000 (09:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 6 Apr 2010 16:56:40 +0000 (09:56 -0700)
commit562132b18009fecc1d7f613a0cedead4ecad06f7
tree668c4ebb39e94755835364d2ba16615ae8c4ec82
parentfa74b54f1edecad7b8803da12d9a3050f85a7048
parentcb4ec259b5842bc0c5815eaefd006765d3e83467
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
drivers/watchdog/hpwdt.c