tree ae784d4578da59617f87e36728ed2cafb2be50d6
parent be84bfcc3ed8f824751ab79349779e50cc98aa01
parent 8a745f1f39b7a20047a362b67ce9151c07d14440
author Linus Torvalds <torvalds@linux-foundation.org> 1305927087 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305927087 -0700

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: Power off empty ports
  libata-pmp: add support for Thermaltake BlackX Duet esata drive dock
  ATA: Don't powerdown Compaq Triflex IDE device on suspend
  libata: Use Maximum Write Same Length to report discard size limit
  drivers/ata/acard-ahci.c: fix enum warning
  pata_at91: SMC settings calculation bugfixes, support for t6z and IORDY
  libata-sff: prevent irq descriptions for dummy ports
  pata_cm64x: fix boot crash on parisc