Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:48:52 +0000 (12:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:48:52 +0000 (12:48 -0700)
commitefcbae253f97bf82e7befd372da3ad5995a53f1a
treefbbba7dc1af78b341fbaab0bf329d343accff4ea
parent54a772b8aace3df8ad6af0bd0748f57d27f72b1d
parentf71d26bb6503e9b11b91444819b2f96872baaab8
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:
  watchdog: hpwdt depends on PCI
  watchdog: fix hpwdt Kconfig regression in 3.0-rc