Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 21 May 2013 16:57:54 +0000 (10:57 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 21 May 2013 16:57:54 +0000 (10:57 -0600)
* 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


Trivial merge