Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

init/main.c

@@ -596,9 +596,15 @@ static int init(void * unused)
 	do_pre_smp_initcalls();
 
 	smp_init();
-	do_basic_setup();
 
+	/*
+	 * Do this before initcalls, because some drivers want to access
+	 * firmware files.
+	 */
 	populate_rootfs();
+
+	do_basic_setup();
+
 	/*
 	 * check if there is an early userspace init.  If yes, let it do all
 	 * the work