tree 4a3eb0927409d3e8ca199cc690056c188b232eb2
parent 6015ff103133c7e50a753c198c69bcabc3a5e3b0
parent b73fa4630e63e4d23407181c2bc0a54777bd0ce8
author Linus Torvalds <torvalds@linux-foundation.org> 1326852698 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326852698 -0800

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