Merge remote-tracking branch 'dt-rh/for-next'

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc arch/mips/ralink/of.c
Simple merge

diff --cc arch/powerpc/platforms/8xx/tqm8xx_setup.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge

diff --cc arch/powerpc/sysdev/mpic.c
Simple merge

diff --cc drivers/cpufreq/pasemi-cpufreq.c
Simple merge

diff --cc drivers/crypto/caam/ctrl.c
Simple merge

diff --cc drivers/crypto/talitos.c
Simple merge

diff --cc drivers/mtd/nand/fsl_elbc_nand.c
Simple merge

diff --cc drivers/mtd/nand/fsl_ifc_nand.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/freescale/ucc_geth.c
Simple merge

diff --cc drivers/net/ethernet/ibm/emac/core.c
Simple merge

diff --cc drivers/net/ethernet/xilinx/ll_temac_main.c
Simple merge

diff --cc drivers/of/address.c
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc drivers/of/fdt.c
index a4fa9ad31b8f7cfb62f45abf47ada0649d87b867,5c479104fc677a2169c3f49b02ebde8435365fdd..2fa024b97c4350c680e384c645dc17d0fc5dc177
--- 1/drivers/of/fdt.c
--- 2/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@@ -801,4 -910,39 +909,28 @@@ void __init unflatten_device_tree(void
        of_alias_scan(early_init_dt_alloc_memory_arch);
  }
  
+ /**
+  * unflatten_and_copy_device_tree - copy and create tree of device_nodes from flat blob
+  *
+  * Copies and unflattens the device-tree passed by the firmware, creating the
+  * tree of struct device_node. It also fills the "name" and "type"
+  * pointers of the nodes so the normal device-tree walking functions
+  * can be used. This should only be used when the FDT memory has not been
+  * reserved such is the case when the FDT is built-in to the kernel init
+  * section. If the FDT memory is reserved already then unflatten_device_tree
+  * should be used instead.
+  */
+ void __init unflatten_and_copy_device_tree(void)
+ {
+       int size = __be32_to_cpu(initial_boot_params->totalsize);
+       void *dt = early_init_dt_alloc_memory_arch(size,
+               __alignof__(struct boot_param_header));
+ 
+       if (dt) {
+               memcpy(dt, initial_boot_params, size);
+               initial_boot_params = dt;
+       }
+       unflatten_device_tree();
+ }
+ 
  #endif /* CONFIG_OF_EARLY_FLATTREE */
 -
 -/* Feed entire flattened device tree into the random pool */
 -static int __init add_fdt_randomness(void)
 -{
 -      if (initial_boot_params)
 -              add_device_randomness(initial_boot_params,
 -                              be32_to_cpu(initial_boot_params->totalsize));
 -
 -      return 0;
 -}
 -core_initcall(add_fdt_randomness);

diff --cc drivers/spi/spi-mpc512x-psc.c
Simple merge

diff --cc sound/soc/fsl/fsl_dma.c
Simple merge

diff --cc sound/soc/fsl/mpc5200_dma.c
Simple merge