tree fbbba7dc1af78b341fbaab0bf329d343accff4ea
parent 54a772b8aace3df8ad6af0bd0748f57d27f72b1d
parent f71d26bb6503e9b11b91444819b2f96872baaab8
author Linus Torvalds <torvalds@linux-foundation.org> 1310932132 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310932132 -0700

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