Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 1 Jun 2013 23:50:39 +0000 (17:50 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 1 Jun 2013 23:50:39 +0000 (17:50 -0600)
commit0345d3f8b2dc761fdebc009093d01c6cec4f11f7
tree850d0e0b6d363953fd8c23ec43ce2826a53ce32b
parentb194dbf5eeb4542ff350e30981256c9cb23033fb
parent9a994e8ec7e7d6b1a66c74a683596b0f38f4e345
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Replace strict_strtoul() with kstrtoul()
  PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPM
  PCI: Replace printks with appropriate pr_*()
  PCI: Fix kerneldoc for pci_disable_link_state()
  x86/PCI: Increase info->res_num before checking pci_use_crs
  PCI: Fix INTC comment typo for pci_swizzle_interrupt_pin()
  PCI: Convert ioapic.c to module_pci_driver