git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
84ac69e
aec5c3c
)
Merge branch 'upstream'
author
Jeff Garzik
<jeff@garzik.org>
Fri, 24 Mar 2006 17:29:39 +0000
(12:29 -0500)
committer
Jeff Garzik
<jeff@garzik.org>
Fri, 24 Mar 2006 17:29:39 +0000
(12:29 -0500)
Conflicts:
drivers/scsi/libata-core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff