]> err.no Git - linux-2.6/commitdiff
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:52:42 +0000 (21:52 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:52:42 +0000 (21:52 -0400)
1  2 
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/libata.h

Simple merge
Simple merge
Simple merge