tree 68a0c7cbe30731c52f7842d09bbf50b3c30a02e7
parent bf4f42b441919417386beb2f9c58e802e7de89df
parent 476099a1b3950285013dd8df0869df6fceaf6579
author Linus Torvalds <torvalds@linux-foundation.org> 1278002232 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278002232 -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: docs: add an entry for imx2_wdt