From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jun 2008 19:55:00 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.26-rc7~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a8051fde6b71ac9a0e63c861c81c59ba776175f9;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: Fix NMI handling."
  [WATCHDOG] hpwdt: Add CFLAGS to get driver working
  Revert "[WATCHDOG] make watchdog/hpwdt.c:asminline_call() static"
---

a8051fde6b71ac9a0e63c861c81c59ba776175f9