projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4e7b89 b410333)
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)
1  2 
drivers/scsi/libata-scsi.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_error.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libata-scsi.c
Simple merge
diff --cc drivers/scsi/scsi_error.c
Simple merge
Domain: System / Kernel;