]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0274aa2 86b3786)
Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 10 Aug 2005 17:46:28 +0000 (13:46 -0400)
1  2 
drivers/scsi/libata-scsi.c patch | diff1 | diff2 | blob | history
include/scsi/scsi.h patch | diff1 | diff2 | blob | history

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