git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7796705
f1a58ec
)
Merge branch 'upstream-fixes' into upstream
author
Jeff Garzik
<jeff@garzik.org>
Tue, 22 Aug 2006 10:10:49 +0000
(06:10 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Tue, 22 Aug 2006 10:10:49 +0000
(06:10 -0400)
Conflicts:
drivers/ata/ata_piix.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff