Merge branch 'pci/shane-amd-ahci-i2c' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Jun 2013 21:34:15 +0000 (15:34 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Jun 2013 21:34:15 +0000 (15:34 -0600)
* 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

1  2 
drivers/pci/quirks.c

Simple merge