From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 19 Feb 2008 16:02:04 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.25-rc3~123
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9ef38eaf4289a99beb3bc13d1ded220a68cc8877;p=linux-2.6-block.git

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] HP ProLiant WatchDog driver
  [WATCHDOG] blackfin Watchdog driver: relocate all strings used in __init functions to __initdata
  [WATCHDOG] Convert mtx1 wdt to be a platform device and use generic GPIO API
  [WATCHDOG] Add support for SB1 hardware watchdog
---

9ef38eaf4289a99beb3bc13d1ded220a68cc8877