Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commit814b3bed63c23f310121befa0fe004a20dec95b2
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 19:54:03 +0000 (30 12:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 19:54:03 +0000 (30 12:54 -0700)
tree88a8ce02ee9d74dff2e58f75b98d0ce60621ab0a
parente61467e9b6c88e97560873603cf9aceaf7435480
parent29fa0586de4fe518f122a915b8c6e92d12e8ca7f
Merge git://git./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