From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 02:03:29 +0000 (+1000)
Subject: Merge remote-tracking branch 'modules/modules-next'
X-Git-Tag: next-20140530~62
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=deacf85909ea65b8f4df438625dce44c3c8b89cc;p=karo-tx-linux.git

Merge remote-tracking branch 'modules/modules-next'
---

deacf85909ea65b8f4df438625dce44c3c8b89cc
diff --cc init/main.c
index 48655ceb66f4,e9d458b5d77b..840f8e2a6c46
--- a/init/main.c
+++ b/init/main.c
@@@ -476,9 -497,9 +497,9 @@@ static void __init mm_init(void
  	vmalloc_init();
  }
  
 -asmlinkage void __init start_kernel(void)
 +asmlinkage __visible void __init start_kernel(void)
  {
- 	char * command_line;
+ 	char * command_line, *after_dashes;
  	extern const struct kernel_param __start___param[], __stop___param[];
  
  	/*