Merge 3.4-rc5 into driver-core-next

This was done to resolve a merge issue with the init/main.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc drivers/staging/android/Kconfig
Simple merge

diff --cc init/main.c
index 11bc6f7ed866498e04233c0ac5aee883430d2980,44b2433334c749ed92d7e42e5938f840efd843c0..92c47c4dbde85831f2701b56c5a31430d7231620
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -225,14 -225,9 +225,9 @@@ static int __init loglevel(char *str
  
  early_param("loglevel", loglevel);
  
- /*
-  * Unknown boot options get handed to init, unless they look like
-  * unused parameters (modprobe will find them in /proc/cmdline).
-  */
- static int __init unknown_bootoption(char *param, char *val,
-                               const char *unused)
+ /* Change NUL term back to "=", to make "param" the whole string. */
 -static int __init repair_env_string(char *param, char *val)
++static int __init repair_env_string(char *param, char *val, const char *unused)
  {
-       /* Change NUL term back to "=", to make "param" the whole string. */
        if (val) {
                /* param=val or param="val"? */
                if (val == param+strlen(param)+1)
@@@ -244,6 -239,16 +239,16 @@@
                } else
                        BUG();
        }
 -static int __init unknown_bootoption(char *param, char *val)
+       return 0;
+ }
+ 
+ /*
+  * Unknown boot options get handed to init, unless they look like
+  * unused parameters (modprobe will find them in /proc/cmdline).
+  */
 -      repair_env_string(param, val);
++static int __init unknown_bootoption(char *param, char *val, const char *unused)
+ {
++      repair_env_string(param, val, unused);
  
        /* Handle obsolete-style parameters */
        if (obsolete_checksetup(param))
@@@ -723,22 -728,16 +728,16 @@@ static initcall_t *initcall_levels[] __
  };
  
  static char *initcall_level_names[] __initdata = {
 -      "early parameters",
 -      "core parameters",
 -      "postcore parameters",
 -      "arch parameters",
 -      "subsys parameters",
 -      "fs parameters",
 -      "device parameters",
 -      "late parameters",
 +      "early",
 +      "core",
 +      "postcore",
 +      "arch",
 +      "subsys",
 +      "fs",
 +      "device",
 +      "late",
  };
  
- static int __init ignore_unknown_bootoption(char *param, char *val,
-                                       const char *doing)
- {
-       return 0;
- }
- 
  static void __init do_initcall_level(int level)
  {
        extern const struct kernel_param __start___param[], __stop___param[];
@@@ -749,7 -748,7 +748,7 @@@
                   static_command_line, __start___param,
                   __stop___param - __start___param,
                   level, level,
-                  &ignore_unknown_bootoption);
 -                 repair_env_string);
++                 &repair_env_string);
  
        for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
                do_one_initcall(*fn);

diff --cc lib/kobject.c
Simple merge