projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
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
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:48:52 +0000
(12:48 -0700)
committer
Linus 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