From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 May 2010 01:34:58 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: firefly_0821_release~9833^2~1642
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa36c7bf987dfa5597c0f7c46f8fca46b2dd33d2;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:
  libata: implement dump_id force param
  libata: disable ATAPI AN by default
  libata-sff: make BMDMA optional
  libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf
  libata-sff: separate out BMDMA init
  libata-sff: separate out BMDMA irq handler
  libata-sff: ata_sff_irq_clear() is BMDMA specific
  sata_mv: drop unncessary EH callback resetting
---

aa36c7bf987dfa5597c0f7c46f8fca46b2dd33d2