tree 290bbc34fed8698b883e3a9a08da71df20a85efa
parent 19b022572b9e0fa8ce5490db888714ecb2b1293e
parent 2b21ef0aae65f22f5ba86b13c4588f6f0c2dbefb
author Linus Torvalds <torvalds@linux-foundation.org> 1417982414 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1417982414 -0800

Merge branch 'for-3.18-fixes' of git://git.kernel.org/pub/scm/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