]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79072f3 26ec634)
Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:16 +0000 (16:54 -0400)
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
Clone of davem's net-next-2.6 tree