projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54a772b f71d26b)
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)
* 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


Trivial merge
John Crispins staging tree