Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
  of/flattree: forward declare struct device_node in of_fdt.h
  ipmi: explicitly include of_address.h and of_irq.h
  sparc: explicitly cast negative phandle checks to s32
  powerpc/405: Fix missing #{address,size}-cells in i2c node
  powerpc/5200: dts: refactor dts files
  powerpc/5200: dts: Change combatible strings on localbus
  powerpc/5200: dts: remove unused properties
  powerpc/5200: dts: rename nodes to prepare for refactoring dts files
  of/flattree: Update dtc to current mainline.
  of/device: Don't register disabled devices
  powerpc/dts: fix syntax bugs in bluestone.dts
  of: Fixes for OF probing on little endian systems
  of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
  of/flattree: Add of_flat_dt_match() helper function
  of_serial: explicitly include of_irq.h
  of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
  of/flattree: Reorder unflatten_dt_node
  of/flattree: Refactor unflatten_dt_node
  of/flattree: Add non-boottime device tree functions
  of/flattree: Add Kconfig for EARLY_FLATTREE
  ...

Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.

diff --cc arch/sparc/prom/init_64.c
index 9c6ac4b,200528b..5016c5e
--- 1/arch/sparc/prom/init_64.c
--- 2/arch/sparc/prom/init_64.c
+++ b/arch/sparc/prom/init_64.c
@@@ -35,9 -35,10 +35,9 @@@ void __init prom_init(void *cif_handler
        prom_cif_init(cif_handler, cif_stack);
  
        prom_chosen_node = prom_finddevice(prom_chosen_path);
-       if (!prom_chosen_node || prom_chosen_node == -1)
+       if (!prom_chosen_node || (s32)prom_chosen_node == -1)
                prom_halt();
  
 -      prom_stdin = prom_getint(prom_chosen_node, "stdin");
        prom_stdout = prom_getint(prom_chosen_node, "stdout");
  
        node = prom_finddevice("/openprom");

diff --cc arch/sparc/prom/tree_32.c
Simple merge

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

diff --cc drivers/net/xilinx_emaclite.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge