From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jun 2008 18:23:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.26-rc8~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=de08341a0ef747d607542af3ae441b286f503e35;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:
  Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"
---

de08341a0ef747d607542af3ae441b286f503e35