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
This commit is contained in:
Bjorn Helgaas 2013-06-04 15:34:15 -06:00
commit b1267d60ce
6 changed files with 9 additions and 4 deletions