From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 31 Oct 2013 20:12:40 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: v3.13-rc1~95^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5;p=pandora-kernel.git

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
---

33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5
Reading git-diff-tree failed