From: Bjorn Helgaas Date: Wed, 9 Jan 2013 18:37:01 +0000 (-0700) Subject: Merge branch 'pci/misc' into next X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e84d0dedd324379bd784be748314b251334a79b6;p=deliverable%2Flinux.git Merge branch 'pci/misc' into next * pci/misc: PCI: cpqphp: Cleanup and remove unreachable paths PCI: Drop "__" prefix on __pci_enable_device_flags() PCI: Use "unsigned long" for __pci_enable_device_flags to match ioport.h mn10300/PCI: Remove unused pci_root_bus frv/PCI: Remove unused pci_root_bus x86/PCI: Remove unused pci_root_bus --- e84d0dedd324379bd784be748314b251334a79b6