From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Dec 2014 20:00:14 +0000 (-0800)
Subject: Merge branch 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=820b688bed62f21020873c055f521b9e1f45a954;p=openwrt%2Fstaging%2Fblogic.git

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

Pull libata fixes from Tejun Heo:
 "Three libata fixes for v3.18.  Nothing too interesting.  PCI ID ID and
  quirk additions to ahci and an error handling path fix in sata_fsl"

* 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: disable MSI on SAMSUNG 0xa800 SSD
  sata_fsl: fix error handling of irq_of_parse_and_map
  AHCI: Add DeviceIDs for Sunrise Point-LP SATA controller
---

820b688bed62f21020873c055f521b9e1f45a954