]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aaadff8 8802684)
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:58:53 +0000 (10:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:58:53 +0000 (10:58 -0500)
1  2 
drivers/scsi/libata-scsi.c patch | diff1 | diff2 | blob | history

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