git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1049cb4
2f9719b
)
Merge branch 'upstream-fixes' into upstream
author
Jeff Garzik
<jeff@garzik.org>
Mon, 12 Jun 2006 03:04:37 +0000
(23:04 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Mon, 12 Jun 2006 03:04:37 +0000
(23:04 -0400)
Conflicts:
drivers/scsi/sata_sil24.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff