diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-07 20:00:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-07 20:00:14 (GMT) |
| commit | 820b688bed62f21020873c055f521b9e1f45a954 (patch) | |
| tree | 290bbc34fed8698b883e3a9a08da71df20a85efa /Makefile | |
| parent | 19b022572b9e0fa8ce5490db888714ecb2b1293e (diff) | |
| parent | 2b21ef0aae65f22f5ba86b13c4588f6f0c2dbefb (diff) | |
| download | linux-820b688bed62f21020873c055f521b9e1f45a954.tar.xz | |
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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions