Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b847548663ef1039dd49f0eb4463d001e596bc3.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --cc drivers/block/nbd.c
Simple merge

diff --cc drivers/message/i2o/i2o_block.c
Simple merge

diff --cc drivers/s390/block/dasd.c
Simple merge

diff --cc drivers/s390/char/tape_block.c
Simple merge

diff --cc drivers/scsi/ata_piix.c
index f796303,4b647ee..557788e
--- 1/drivers/scsi/ata_piix.c
--- 2/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@@ -187,9 -185,6 +187,8 @@@ static struct scsi_host_template piix_s
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
        .bios_param             = ata_std_bios_param,
-       .ordered_flush          = 1,
 +      .resume                 = ata_scsi_device_resume,
 +      .suspend                = ata_scsi_device_suspend,
  };
  
  static const struct ata_port_operations piix_pata_ops = {

diff --cc drivers/scsi/libata-core.c
Simple merge

diff --cc drivers/scsi/libata-scsi.c
Simple merge

diff --cc include/linux/ata.h
Simple merge

diff --cc include/linux/libata.h
Simple merge

diff --cc include/scsi/scsi_host.h
Simple merge