From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 23 Oct 2007 23:36:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.24-rc1~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=af76bbabbdf5cebea6a3863446f9f74b469c4bdc;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] Documentation/watchdog/src/watchdog-simple.c: improve this code
  [WATCHDOG] AR7: watchdog timer
  [WATCHDOG] Linux kernel IPC SBC Watchdog Timer driver
---

af76bbabbdf5cebea6a3863446f9f74b469c4bdc