diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-31 16:12:40 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-31 16:12:40 -0400 |
| commit | 33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5 (patch) | |
| tree | 5e92465442ad3166ba1c9bd423c20d67b018d1e0 /MAINTAINERS | |
| parent | cc17a67c0762a6030b43e98d775a12a99e5ff247 (diff) | |
| parent | 0394cb192db4397753046775a8caa736397737b5 (diff) | |
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bc6d82162ebe..906d440f1afe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6338,6 +6338,7 @@ S: Supported | |||
| 6338 | F: Documentation/PCI/ | 6338 | F: Documentation/PCI/ |
| 6339 | F: drivers/pci/ | 6339 | F: drivers/pci/ |
| 6340 | F: include/linux/pci* | 6340 | F: include/linux/pci* |
| 6341 | F: arch/x86/pci/ | ||
| 6341 | 6342 | ||
| 6342 | PCI DRIVER FOR NVIDIA TEGRA | 6343 | PCI DRIVER FOR NVIDIA TEGRA |
| 6343 | M: Thierry Reding <thierry.reding@gmail.com> | 6344 | M: Thierry Reding <thierry.reding@gmail.com> |