]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitab041f63e5a42b6b9529e5e5db0dc3632d66e59a
treefbbba7dc1af78b341fbaab0bf329d343accff4ea
parenta3af6e6521dd935dd9272592b286d40f525105db
parent1e75e71360c31fdfdc58e24eab8642eae077bfb0
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