git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d7a80da
d588fcb
)
Merge branch 'master' into upstream
author
Jeff Garzik
<jeff@garzik.org>
Fri, 23 Jun 2006 02:11:56 +0000
(22:11 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Fri, 23 Jun 2006 02:11:56 +0000
(22:11 -0400)
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff