diff --git a/[refs] b/[refs]
index c4a9f7ec87c4..9b7eba3701b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c686ecf5040d287a68d4fca7f1948472f556a6d3
+refs/heads/master: 76ec01dbb70353928a9cee826502073ae928bbba
diff --git a/trunk/arch/powerpc/kernel/pci_of_scan.c b/trunk/arch/powerpc/kernel/pci_of_scan.c
index 62dd363a9762..e751506323b4 100644
--- a/trunk/arch/powerpc/kernel/pci_of_scan.c
+++ b/trunk/arch/powerpc/kernel/pci_of_scan.c
@@ -336,7 +336,8 @@ static void __devinit __of_scan_bus(struct device_node *node,
 		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
 		    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS) {
 			struct device_node *child = pci_device_to_OF_node(dev);
-			of_scan_pci_bridge(child, dev);
+			if (child)
+				of_scan_pci_bridge(child, dev);
 		}
 	}
 }