Merge branches 'devel', 'devel-stable' and 'fixes' into for-linus

This commit is contained in:
Russell King
2011-05-27 22:59:57 +01:00
188 changed files with 1455 additions and 6043 deletions
+1 -1
View File
@@ -130,7 +130,7 @@ void __init early_init_devtree(void *params)
* device-tree, including the platform type, initrd location and
* size, TCE reserve, and more ...
*/
of_scan_flat_dt(early_init_dt_scan_chosen, NULL);
of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);
/* Scan memory nodes and rebuild MEMBLOCKs */
memblock_init();