git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e514385
51490c8
)
Merge by hand (conflicts in sr.c)
author
James Bottomley
<jejb@titanic.(none)>
Sun, 28 Aug 2005 16:40:00 +0000
(11:40 -0500)
committer
James Bottomley
<jejb@titanic.(none)>
Sun, 28 Aug 2005 16:40:00 +0000
(11:40 -0500)
Trivial merge