From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Oct 2017 16:30:00 +0000 (-0700)
Subject: Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: microblaze-4.15-rc2~145
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=c1de1591d927bc1e55095d642b3c3cc2e54fc1cd;p=linux-2.6-microblaze.git

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

Pull libata fixes from Tejun Heo:
 "Nothing too interesting.

  Arnd's gcc-7 warning fixes that slipped through the cracks for two
  release cycles (my bad), and two minor low level driver updates"

* 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: don't ignore result code of ahci_reset_controller()
  ata_piix: Add Fujitsu-Siemens Lifebook S6120 to short cable IDs
  ata: avoid gcc-7 warning in ata_timing_quantize
---

c1de1591d927bc1e55095d642b3c3cc2e54fc1cd