]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Jun 2006 23:03:06 +0000 (16:03 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Jun 2006 23:03:06 +0000 (16:03 -0700)
commitfffcb480e4224f25c965b93fa65541bfc7dd732e
treea48383b5487798cdcc0153e342d6d88abe71333d
parentb44597906e03d5e2b467c17a3b73585596c0d7be
parent56fb9e5346b99bc6b77def79b3739097bc13ea8a
Merge /linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] Documentation/watchdog update
  [WATCHDOG] convert AT91RM9200 watchdog to platform driver
  [WATCHDOG] add WDIOC_GETTIMELEFT ioctl
  [WATCHDOG] Pre-Timeout flags