From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Aug 2012 02:59:24 +0000 (+1000)
Subject: Merge remote-tracking branch 'scsi/for-next'
X-Git-Tag: next-20120820~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df8b5db038d87f17aaa489862448b17ade1c9734;p=karo-tx-linux.git

Merge remote-tracking branch 'scsi/for-next'

Conflicts:
	drivers/ata/libata-core.c
---

df8b5db038d87f17aaa489862448b17ade1c9734
diff --cc drivers/ata/libata-core.c
index c3fbdca029ea,6aa72b8350da..9d1e66f24883
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@@ -5295,9 -5294,10 +5299,8 @@@ static int ata_port_request_pm(struct a
  	return rc;
  }
  
- static int ata_port_suspend_common(struct device *dev, pm_message_t mesg)
 -#define to_ata_port(d) container_of(d, struct ata_port, tdev)
 -
+ static int __ata_port_suspend_common(struct ata_port *ap, pm_message_t mesg, int *async)
  {
- 	struct ata_port *ap = to_ata_port(dev);
  	unsigned int ehi_flags = ATA_EHI_QUIET;
  	int rc;