From: Mark Brown <broonie@linaro.org>
Date: Thu, 24 Jul 2014 22:01:03 +0000 (+0100)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~85
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c98536343efee5087773751d2a26899ed302acf3;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/of/fdt.c
---

c98536343efee5087773751d2a26899ed302acf3
diff --cc drivers/of/fdt.c
index d7b7af809ac8,4911158cba8a..26d7060c17bf
--- a/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);