| commit | 723ec4d06cb2eed481436cfe008f5f63c45e88fd | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Apr 17 10:31:34 2013 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Apr 17 10:31:34 2013 -0600 |
| tree | e59112af8616e8fbc0cc6c2219b49fd2f05bfc41 | |
| parent | a3b6bbd5774c13dab89d72f79976ba762913b2f2 [diff] | |
| parent | f39d5b72913e2a9ff00ba5ab145ee05a888b1286 [diff] |
Merge branch 'pci/cleanup' into next * pci/cleanup: PCI: Remove "extern" from function declarations PCI: Warn about failures instead of "must_check" functions PCI: Remove __must_check from definitions PCI: Remove unused variables PCI: Move cpci_hotplug_init() proto to header file PCI: Make local functions/structs static PCI: Fix missing prototype for pcie_port_acpi_setup() Conflicts: drivers/pci/hotplug/acpiphp.h include/linux/pci.h