From: Linus Torvalds Date: Sun, 29 Oct 2006 21:53:05 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Tag: v2.6.19-rc4~25 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7a20655bc5316ccec0f036cde46e609ba5571f5e;p=linux-2.6-omap-h63xx.git 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] sc1200wdt.c pnp unregister fix. --- 7a20655bc5316ccec0f036cde46e609ba5571f5e