]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Aug 2009 21:15:46 +0000 (14:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Aug 2009 21:15:46 +0000 (14:15 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] Fix COH 901 327 watchdog enablement


Trivial merge