From: Linus Torvalds Date: Thu, 1 Jul 2010 16:37:12 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Tag: drm-fsl-dcu-for-next~16377 X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=9fbd7f9d112e50dc7649d13de37bc92cb50c3905 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 --- 9fbd7f9d112e50dc7649d13de37bc92cb50c3905