Merge branch 'merge' into next

We want to bring in the latest IRQ fixes
This commit is contained in:
Benjamin Herrenschmidt
2012-07-10 19:16:43 +10:00
189 changed files with 1732 additions and 1077 deletions

View File

@@ -641,7 +641,7 @@ static void __init parse_drconf_memory(struct device_node *memory)
unsigned int n, rc, ranges, is_kexec_kdump = 0;
unsigned long lmb_size, base, size, sz;
int nid;
struct assoc_arrays aa;
struct assoc_arrays aa = { .arrays = NULL };
n = of_get_drconf_memory(memory, &dm);
if (!n)