tree 5e92465442ad3166ba1c9bd423c20d67b018d1e0
parent cc17a67c0762a6030b43e98d775a12a99e5ff247
parent 0394cb192db4397753046775a8caa736397737b5
author Bjorn Helgaas <bhelgaas@google.com> 1383250360 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1383250360 -0600

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Report pci_pme_active() kmalloc failure
  mn10300/PCI: Remove useless pcibios_last_bus
  frv/PCI: Remove pcibios_last_bus
  PCI: Fail MSI/MSI-X initialization if device is not in PCI_D0
  x86/PCI: Coalesce multiple overlapping host bridge windows
  MAINTAINERS: Add arch/x86/pci to PCI file patterns
  PCI/PM: Remove pci_pm_complete()
  PCI: Add pci_dev_show_local_cpu() to simplify code
  mn10300/PCI: Remove unused pci_mem_start
  cris/PCI: Remove unused pci_mem_start
  PCI: Make pci_dev_pm_ops static

Conflicts:
	drivers/pci/pci-sysfs.c