git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94f8c66
1cc7724
)
Merge watchdog driver updates
author
Linus Torvalds
<torvalds@evo.osdl.org>
Mon, 5 Sep 2005 13:00:45 +0000
(06:00 -0700)
committer
Linus Torvalds
<torvalds@evo.osdl.org>
Mon, 5 Sep 2005 13:00:45 +0000
(06:00 -0700)
Automated merge from
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff