From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Oct 2008 19:54:03 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.28-rc3~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=814b3bed63c23f310121befa0fe004a20dec95b2;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:
  [PATCH] Switch all my contributions stuff to a single common address
  [WATCHDOG] pci: use pci_ioremap_bar() in drivers/watchdog
---

814b3bed63c23f310121befa0fe004a20dec95b2