]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pretzel.yyz.us>
Wed, 22 Jun 2005 17:10:49 +0000 (13:10 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 22 Jun 2005 17:10:49 +0000 (13:10 -0400)
1  2 
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h
include/scsi/scsi.h

Simple merge
Simple merge
Simple merge