From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Jul 2008 18:18:10 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: firefly_0821_release~19671
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b312bf359e20cc39c00d480fd40a24c245d80bf7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream-linus' of git://git./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
---

b312bf359e20cc39c00d480fd40a24c245d80bf7