From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 4 Jun 2013 21:34:15 +0000 (-0600)
Subject: Merge branch 'pci/shane-amd-ahci-i2c' into next
X-Git-Tag: firefly_0821_release~176^2~5787^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b1267d60ce106be38a136b51a9edbf7c172b9dae;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/shane-amd-ahci-i2c' into next

* pci/shane-amd-ahci-i2c:
  i2c-piix4: Add AMD CZ SMBus device ID
  ahci: Add AMD CZ SATA device ID
  PCI: Put Hudson-2 device IDs together
---

b1267d60ce106be38a136b51a9edbf7c172b9dae