tree 756247f113688403cf35d1d7437fc92d390279d2
parent dc221eae08eea3b0db127d1f152fac24d10b6a52
parent 2640d7c0b8d5d9d9ee303b8cd09f5124176f6239
author Linus Torvalds <torvalds@linux-foundation.org> 1216145890 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216145890 -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:
  AHCI: Remove an unnecessary flush from ahci_qc_issue
  AHCI: speed up resume
  [libata] Add support for VPD page b1
  ata: endianness annotations in pata drivers
  libata-eh: update atapi_eh_request_sense() to take @dev instead of @qc
  [libata] sata_svw: update code comments relating to data corruption
  libata/ahci: enclosure management support
  libata: improve EH internal command timeout handling
  libata: use ULONG_MAX to terminate reset timeout table
  libata: improve EH retry delay handling
  libata: consistently use msecs for time durations