]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'tmp'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:26:46 +0000 (02:26 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:26:46 +0000 (02:26 -0500)
1  2 
drivers/scsi/libata-core.c
include/linux/ata.h
include/linux/libata.h

Simple merge
Simple merge
Simple merge