From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Jul 2011 19:48:52 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v3.0~22
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=efcbae253f97bf82e7befd372da3ad5995a53f1a;p=linux.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: hpwdt depends on PCI
  watchdog: fix hpwdt Kconfig regression in 3.0-rc
---

efcbae253f97bf82e7befd372da3ad5995a53f1a