]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a9f8f9 9dfb780)
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)
1  2 
drivers/scsi/libata-scsi.c patch | diff1 | diff2 | blob | history
drivers/scsi/pdc_adma.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libata-scsi.c
Simple merge
diff --cc drivers/scsi/pdc_adma.c
Simple merge
Linux 2.6 source tree