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

diff --cc drivers/of/fdt.c
index 293f80bd83dd6a1ad8e889a7f53ccded13059754,0e314ba1f9854d4f806dddfa221be81976ef5167..1c193610c9506f5f98109a1e3640b287fa236d74
--- 1/drivers/of/fdt.c
--- 2/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,

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