From: Grant Likely <grant.likely@secretlab.ca>
Date: Sat, 24 Jul 2010 15:49:13 +0000 (-0600)
Subject: Merge commit 'v2.6.35-rc6' into devicetree/next
X-Git-Tag: firefly_0821_release~9833^2~1278^2~20
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4e4f62bf7396fca48efe61513640ee399a6046e3;p=firefly-linux-kernel-4.4.55.git

Merge commit 'v2.6.35-rc6' into devicetree/next

Conflicts:
	arch/sparc/kernel/prom_64.c
---

4e4f62bf7396fca48efe61513640ee399a6046e3
diff --cc arch/sparc/kernel/prom_64.c
index 0bffafdee350,466a32763ea8..86597d9867fd
--- 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>