Merge branch 'tmp'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:36:14 +0000 (02:36 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:36:14 +0000 (02:36 -0500)
commit7dfb869c8e45e5863534f38fdac990829b22964a
treef36bbdba46b022356d05ac26d5073e395d2f8abd
parent628e386e27674906326455f01d87878a5f0cbce7
parent11a56d2439259892319df81cf1582687d7e7fde5
Merge branch 'tmp'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
include/linux/libata.h