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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc init/main.c
index 48655ceb66f45cdf27cf8bf769d9de296175a21c,e9d458b5d77bd34449473d6b777da545aec8a81b..840f8e2a6c46fbbcee9c72d6c697a11f163728b9
--- 1/init/main.c
--- 2/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[];
  
        /*

diff --cc kernel/module.c
Simple merge