]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7fb585 a18ceba)
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:59:55 +0000 (10:59 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:59:55 +0000 (10:59 -0500)
1  2 
drivers/scsi/libata-scsi.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libata-scsi.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.