From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Aug 2011 03:27:51 +0000 (+1000)
Subject: Merge branch 'akpm'
X-Git-Tag: next-20110822~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=56c3d812266bc103c7c665d2682f95e76a1312bf;p=karo-tx-linux.git

Merge branch 'akpm'
---

56c3d812266bc103c7c665d2682f95e76a1312bf
diff --cc init/do_mounts.c
index c0851a8e030c,bcbeca7a6655..0f6e1d985a3b
--- a/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;