Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide/ide-scan-pci.c: Use for_each_pci_dev().
  ide: Use linux/mutex.h
  IDE: ide-floppy, remove unnecessary NULL check
  drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdata
  ide: fix use after free in ide-acpi

diff --combined drivers/ide/ide-floppy.c
index 5a702d02c848a172dc031a2ac53adca6882b6510,536ff68062abe83dc88ef9b70275ef312b6847a3..61fdf544fbd63193926010ff33fef34f9d30dbe9
--- 1/drivers/ide/ide-floppy.c
--- 2/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@@ -73,7 -73,7 +73,7 @@@ static int ide_floppy_callback(ide_driv
                drive->failed_pc = NULL;
  
        if (pc->c[0] == GPCMD_READ_10 || pc->c[0] == GPCMD_WRITE_10 ||
-           (rq && rq->cmd_type == REQ_TYPE_BLOCK_PC))
+           rq->cmd_type == REQ_TYPE_BLOCK_PC)
                uptodate = 1; /* FIXME */
        else if (pc->c[0] == GPCMD_REQUEST_SENSE) {
  
@@@ -107,7 -107,7 +107,7 @@@
  static void ide_floppy_report_error(struct ide_disk_obj *floppy,
                                    struct ide_atapi_pc *pc)
  {
 -      /* supress error messages resulting from Medium not present */
 +      /* suppress error messages resulting from Medium not present */
        if (floppy->sense_key == 0x02 &&
            floppy->asc       == 0x3a &&
            floppy->ascq      == 0x00)