| commit | 755bda3fe3006eae7298f0f58c59313088e30196 | |
| author | Bjorn Helgaas <bhelgaas@google.com> | |
| Tue, 21 May 2013 16:57:54 +0000 (21 10:57 -0600) | ||
| committer | Bjorn Helgaas <bhelgaas@google.com> | |
| Tue, 21 May 2013 16:57:54 +0000 (21 10:57 -0600) | ||
| tree | f863949b30c8a3e0b3096b1284096a6e675069b7 | treesnapshot (tar.gz zip) |
| parent | f722406faae2d073cc1d01063d1123c35425939e | commitdiff |
| parent | 2add0ec14c259471d45d6afd051ca02eef0a4a92 | commitdiff |
Merge branch 'pci/misc' into next
* pci/misc:
PCI/ASPM: Warn when driver asks to disable ASPM, but we can't do it
sparc/PCI: Use PCI_UNKNOWN for unknown power state
powerpc/PCI: Use PCI_UNKNOWN for unknown power state
PCI/ACPI: Check acpi_resource_to_address64() return value
PCI: Work around Ivytown NTB BAR size issue
* pci/misc:
PCI/ASPM: Warn when driver asks to disable ASPM, but we can't do it
sparc/PCI: Use PCI_UNKNOWN for unknown power state
powerpc/PCI: Use PCI_UNKNOWN for unknown power state
PCI/ACPI: Check acpi_resource_to_address64() return value
PCI: Work around Ivytown NTB BAR size issue