Subject: linux-next: manual merge of the devicetree tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 16 Jul 2010 11:15:20 +1000

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
arch/sparc/kernel/prom_64.c between commit
95f72d1ed41a66f1c1c29c24d479de81a0bea36f ("lmb: rename to memblock") from
Linus' tree and commit 035ebefc737cce56d3938e9b7eaa5ac0e9c28715
("of/sparc: move is_root_node() to of.h") from the devicetree tree.

Just context changes. I fixed it up (see below) and can carry the fix for
a while.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/sparc/kernel/prom_64.c
index 466a327,0bffafd..0000000
--- a/arch/sparc/kernel/prom_64.c
+++ b/arch/sparc/kernel/prom_64.c
@@@ -20,8 -20,8 +20,8 @@@
  #include <linux/string.h>
  #include <linux/mm.h>
  #include <linux/module.h>
 -#include <linux/lmb.h>
 +#include <linux/memblock.h>
- #include <linux/of_device.h>
+ #include <linux/of.h>
  
  #include <asm/prom.h>
  #include <asm/oplib.h>