From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Sep 2008 15:18:17 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.27-rc8~33
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3bd1911b134ce4a669ea6cf531a36440753b0aaa;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] unlocked_ioctl changes
  [WATCHDOG] wdt285: fix sparse warnings
  [WATCHDOG] ibmasr: remove unnecessary spin_unlock()
---

3bd1911b134ce4a669ea6cf531a36440753b0aaa