]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ceb3b02 55c82a6)
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jan 2014 01:08:23 +0000 (09:08 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 Jan 2014 01:08:23 +0000 (09:08 +0800)
commitf8829150d884cddd40deee0f95395317e0109d39
tree0467822c71a29c8f9c1825fd38c4a05d08a4fbc5tree
parentceb3b0212dfc843a6abe8a6f3b4e28c1f2059e64commit | diff
parent55c82a6c2a513de1d8a20c3b3a769129a1a14d50commit | diff
Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata fixes from Tejun Heo:
 "Late fixes for libata.  Nothing too interesting.  Adding missing PM
  callbacks to satat_sis and an additional PCI ID for ahci"

* 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  sata_sis: missing PM support
  ahci: add PCI ID for Marvell 88SE9170 SATA controller
Ubuntu combined Linux kernel mirror