Merge branch 'pci/misc' into next

Browse source

* 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

...

This commit is contained in:

Bjorn Helgaas 2013-10-31 14:12:40 -06:00

parent cc17a67c07 0394cb192d

commit 33de1b8bf6

13 changed files with 29 additions and 85 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

MAINTAINERS

View file

1

arch/cris/include/asm/pci.h

View file

1

arch/frv/mb93090-mb00/pci-frv.h

View file

36

arch/frv/mb93090-mb00/pci-vdk.c

View file

1

arch/mn10300/include/asm/pci.h

View file

3

arch/mn10300/kernel/setup.c

View file

1

arch/mn10300/unit-asb2305/pci-asb2305.h

View file

5

arch/mn10300/unit-asb2305/pci.c

View file

8

arch/x86/pci/acpi.c

View file

6

drivers/pci/msi.c

View file

11

drivers/pci/pci-driver.c

View file

43

drivers/pci/pci-sysfs.c

View file

7

drivers/pci/pci.c

View file