]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jan 2012 02:11:38 +0000 (18:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Jan 2012 02:11:38 +0000 (18:11 -0800)
commitbce388a30e6c2626e6e119ad2c634afb31fbee88
tree4a3eb0927409d3e8ca199cc690056c188b232eb2
parentd8560ef3a36fb12de010814f2b2afae7299c11fe
parent608d71a513e0f346491a1d5d88c7a09855443e4f
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