From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Oct 2013 07:21:34 +0000 (+0100)
Subject: Merge branch 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: firefly_0821_release~176^2~5125
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=19eddab9d94b5a47f154b6a244c7294a505b946f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.12-fixes' of git://git./linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "The only interesting bit is ata_eh_qc_retry() update which fixes a
  problem where a SG_IO command may fail across suspend/resume cycle
  without the command actually being at fault.

  Other changes are low level driver specific and fairly low impact"

* 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libahci: fix turning on LEDs in ahci_start_port()
  libata: make ata_eh_qc_retry() bump scmd->allowed on bogus failures
  ahci_platform: use dev_info() instead of printk()
  ahci: use dev_info() instead of printk()
  pata_isapnp: Don't use invalid I/O ports
---

19eddab9d94b5a47f154b6a244c7294a505b946f