From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jan 2008 22:00:01 +0000 (+1100)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.25-rc1~1168
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8561b089afbaed2651591e5a4574fdca451d82f2;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] constify function pointer tables
  [WATCHDOG] TXx9 watchdog driver
  [WATCHDOG] misc_register patch
  [WATCHDOG] wdt: fix locking
---

8561b089afbaed2651591e5a4574fdca451d82f2