Merge branch 'akpm'

diff --cc init/do_mounts.c
index c0851a8e030cbcf38701f77a5d79e253d81e0327,bcbeca7a6655f949ffb70890df43d642d79c8de0..0f6e1d985a3b2851c662337c1671b57cc4270f0a
--- 1/init/do_mounts.c
--- 2/init/do_mounts.c
+++ b/init/do_mounts.c
@@@ -28,7 -28,7 +28,7 @@@ int __initdata rd_doload;     /* 1 = load R
  int root_mountflags = MS_RDONLY | MS_SILENT;
  static char * __initdata root_device_name;
  static char __initdata saved_root_name[64];
--static int __initdata root_wait;
++static int root_wait;
  
  dev_t ROOT_DEV;