projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 19b0225 2b21ef0)
Merge branch 'for-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Dec 2014 20:00:14 +0000 (12:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Dec 2014 20:00:14 +0000 (12:00 -0800)
commit820b688bed62f21020873c055f521b9e1f45a954
tree290bbc34fed8698b883e3a9a08da71df20a85efatree | snapshot
parent19b022572b9e0fa8ce5490db888714ecb2b1293ecommit | diff
parent2b21ef0aae65f22f5ba86b13c4588f6f0c2dbefbcommit | diff
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
John Crispins staging tree