tree be9c931f200aa3505647750ac87a6f8f124a5485
parent f579bbcd9bb8b688df03191b92c56ab8af4d6322
parent 7affb32a32eabbbe42d6746923ec1d0bf7327234
author Linus Torvalds <torvalds@linux-foundation.org> 1255029765 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255029765 -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:
  pata_atp867x: add Power Management support
  pata_atp867x: PIO support fixes
  pata_atp867x: clarifications in timings calculations and cable detection
  pata_atp867x: fix it to not claim MWDMA support
  libata: fix incorrect link online check during probe
  ahci: filter FPDMA non-zero offset enable for Aspire 3810T
  libata: make gtf_filter per-dev
  libata: implement more acpi filtering options
  libata: cosmetic updates
  ahci: display all AHCI 1.3 HBA capability flags (v2)
  pata_ali: trivial fix of a very frequent spelling mistake
  ahci: disable 64bit DMA by default on SB600s