diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-04 15:34:15 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-04 15:34:15 -0600 |
| commit | b1267d60ce106be38a136b51a9edbf7c172b9dae (patch) | |
| tree | 6539c8f1dea4f6368162779f0b6954b916dd21e2 /net/openvswitch/datapath.c | |
| parent | 278934bdc46a3de02f24c6d4a550cf668aa8cf83 (diff) | |
| parent | b996ac90f595dda271cbd858b136b45557fc1a57 (diff) | |
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
Diffstat (limited to 'net/openvswitch/datapath.c')
0 files changed, 0 insertions, 0 deletions