git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 200d5a7 55d8ca4)
Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:58:22 +0000 (19:58 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:58:22 +0000 (19:58 -0500)
1  2 
drivers/scsi/libata-scsi.c patch | diff1 | diff2 | blob | history
include/linux/libata.h patch | diff1 | diff2 | blob | history

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