Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Jul 2010 16:37:12 +0000 (09:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Jul 2010 16:37:12 +0000 (09:37 -0700)
commit9fbd7f9d112e50dc7649d13de37bc92cb50c3905
tree68a0c7cbe30731c52f7842d09bbf50b3c30a02e7
parentbf4f42b441919417386beb2f9c58e802e7de89df
parent476099a1b3950285013dd8df0869df6fceaf6579
Merge git://git./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