git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
75e9958
0737ac8
)
Merge branch 'upstream-fixes' into upstream
author
Jeff Garzik
<jeff@garzik.org>
Sun, 28 May 2006 20:32:59 +0000
(16:32 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Sun, 28 May 2006 20:32:59 +0000
(16:32 -0400)
Conflicts:
drivers/scsi/libata-core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff