Merge branch 'upstream'
commitc4052da6f0c01a0b059d125d72bb934d0980b798
authorJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 15:16:14 +0000 (9 11:16 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 15:16:14 +0000 (9 11:16 -0400)
treead50a17e4d14b8f6f1773158d956d424575d1712
parentcedc9a478d8c6265879dc3839ef3d4849a709184
parent3d3467f0fdf61a421361c00cf84fcf0f1a6dc1e8
Merge branch 'upstream'
drivers/scsi/ahci.c
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/libata.h