]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Thu, 8 Sep 2005 09:39:55 +0000 (05:39 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 8 Sep 2005 09:39:55 +0000 (05:39 -0400)
1  2 
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h

Simple merge
Simple merge