From: Bjorn Helgaas Date: Sat, 1 Jun 2013 23:50:39 +0000 (-0600) Subject: Merge branch 'pci/misc' into next X-Git-Tag: v3.11-rc1~100^2~9 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0345d3f8b2dc761fdebc009093d01c6cec4f11f7;p=users%2Fjedix%2Flinux-maple.git 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 --- 0345d3f8b2dc761fdebc009093d01c6cec4f11f7