From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 Jan 2014 01:08:23 +0000 (+0800)
Subject: Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: firefly_0821_release~176^2~4693
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f8829150d884cddd40deee0f95395317e0109d39;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.13-fixes' of git://git./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
---

f8829150d884cddd40deee0f95395317e0109d39