projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6a33e2 5fadd05)
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:29 +0000 (12:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:29 +0000 (12:30 -0400)
1  2 
drivers/scsi/libata-scsi.c patch | diff1 | diff2 | blob | history
include/linux/ata.h patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libata-scsi.c
Simple merge
diff --cc include/linux/ata.h
Simple merge
Domain: System / Kernel;