Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/libata-core.c

diff --cc drivers/scsi/libata-core.c
index 9051b6821c1c790d028925930b214d0ae3a538ad,823dfa78c0ba527ea3e38c94dc7114e31457f4ca..00881226f8dd789624a955c5c910f018f8ce8e6c
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -3090,9 -2740,10 +3093,9 @@@ static unsigned int ata_dev_set_xfermod
  
  /**
   *    ata_dev_init_params - Issue INIT DEV PARAMS command
 - *    @ap: Port associated with device @dev
   *    @dev: Device to which command will be sent
-  *    @heads: Number of heads
-  *    @sectors: Number of sectors
+  *    @heads: Number of heads (taskfile parameter)
+  *    @sectors: Number of sectors (taskfile parameter)
   *
   *    LOCKING:
   *    Kernel thread context (may sleep)
@@@ -5006,7 -4305,9 +5009,8 @@@ int ata_device_resume(struct ata_devic
  
  /**
   *    ata_device_suspend - prepare a device for suspend
 - *    @ap: port the device is connected to
   *    @dev: the device to suspend
+  *    @state: target power management state
   *
   *    Flush the cache on the drive, if appropriate, then issue a
   *    standbynow command.

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