Merge 3.11-rc3 into char-misc-next.

This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index f46914a0f33e..7d22a675fe1a 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1462,6 +1462,8 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
         /* Allocate bus and devices resources */
         pcibios_allocate_bus_resources(bus);
         pcibios_claim_one_bus(bus);
+        if (!pci_has_flag(PCI_PROBE_ONLY))
+                pci_assign_unassigned_bus_resources(bus);
 
         /* Fixup EEH */
         eeh_add_device_tree_late(bus);