]> 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: 6f2f381 8be3de3)
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 03:54:56 +0000 (23:54 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 03:54:56 +0000 (23:54 -0400)
1  2 
drivers/scsi/libata-core.c patch | diff1 | diff2 | blob | history
include/linux/libata.h patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libata-core.c
Simple merge
diff --cc include/linux/libata.h
Simple merge
Clone of davem's net-next-2.6 tree