Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	drivers/of/fdt.c

diff --cc drivers/of/fdt.c
index d7b7af809ac8d078c25010f5d7835e67641f34ac,4911158cba8a154b80aaeac44ef39a05741d93df..26d7060c17bfb49cd9069871609ad092df3d2e7b
--- 1/drivers/of/fdt.c
--- 2/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@@ -689,9 -705,8 +728,9 @@@ static const char *config_cmdline = ""
  int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
                                     int depth, void *data)
  {
-       unsigned long l = 0;
-       char *p = NULL;
+       int l;
+       const char *p;
 +      char *cmdline = data;
  
        pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);
  

diff --cc include/linux/of_fdt.h
Simple merge