From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 20 May 2006 04:36:08 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: upstream/snapshot3+hdmi~40144^2~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/libata-core.c
---

3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb
diff --cc drivers/scsi/libata-core.c
index 9051b68,823dfa7..0088122
--- a/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.