Merge branch 'irq-pio'
authorTejun Heo <htejun@gmail.com>
Mon, 15 May 2006 11:59:15 +0000 (20:59 +0900)
committerTejun Heo <htejun@gmail.com>
Mon, 15 May 2006 11:59:15 +0000 (20:59 +0900)
commit12436c30f4808e00fa008c6787c609bc6ae216ba
tree22ddaad8def4f4a77637a3da62a8d8f422a95c29
parent88ce7550c38f46c8697f53727a571bf838bee398
parent7894eaf291238a62a565e9e9777483beeb00eeae
Merge branch 'irq-pio'

Conflicts:

drivers/scsi/libata-core.c
include/linux/libata.h
drivers/scsi/libata-core.c
drivers/scsi/libata-eh.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_sx4.c
include/linux/ata.h
include/linux/libata.h