From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jan 2012 02:11:38 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=488a9d018256dc9f29e041c0360445b6d25eea9a;p=~shefty%2Frdma-dev.git

Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev

* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  [libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list due to broken suspend functionality.
  [libata] add DVRTD08A and DVR-215 to NOSETXFER device quirk list
  [libata] pata_bf54x: Support sg list in bmdma transfer.
  [libata] sata_fsl: fix the controller operating mode
  [libata] enable ata port async suspend
---

488a9d018256dc9f29e041c0360445b6d25eea9a