From: Grant Likely <grant.likely@linaro.org>
Date: Tue, 30 Jun 2015 13:28:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'robh/for-next' into devicetree/next
X-Git-Tag: v4.2-rc1~44^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=becfc3c86df963491ff1d5ffc6131a06af6bb851;p=platform%2Fkernel%2Flinux-exynos.git

Merge remote-tracking branch 'robh/for-next' into devicetree/next
---

becfc3c86df963491ff1d5ffc6131a06af6bb851
diff --cc drivers/of/fdt.c
index 293f80b,0e314ba..1c19361
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@@ -164,14 -164,11 +164,14 @@@ static void *unflatten_dt_alloc(void **
   * unflatten_dt_node - Alloc and populate a device_node from the flat tree
   * @blob: The parent device tree blob
   * @mem: Memory chunk to use for allocating device nodes and properties
 - * @p: pointer to node in flat tree
 + * @poffset: pointer to node in flat tree
   * @dad: Parent struct device_node
 + * @nodepp: The device_node tree created by the call
   * @fpsize: Size of the node path up at the current depth.
 + * @dryrun: If true, do not allocate device nodes but still calculate needed
 + * memory size
   */
- static void * unflatten_dt_node(void *blob,
+ static void * unflatten_dt_node(const void *blob,
  				void *mem,
  				int *poffset,
  				struct device_node *dad,