Merge branch '3.15-fixes' into mips-for-linux-next

2014-06-04 22:53:02 +02:00
parent 1d421ca9d7 f7a89f1b8e
commit f8647b506d
396 changed files with 5493 additions and 2527 deletions
--- a/arch/mips/pci/pci-rc32434.c
+++ b/arch/mips/pci/pci-rc32434.c
@@ -53,7 +53,6 @@ static struct resource rc32434_res_pci_mem1 = {
 	.start = 0x50000000,
 	.end = 0x5FFFFFFF,
 	.flags = IORESOURCE_MEM,
-	.parent = &rc32434_res_pci_mem1,
 	.sibling = NULL,
 	.child = &rc32434_res_pci_mem2
 };