Merge commit 'v2.6.35-rc6' into devicetree/next
Grant Likely [Sat, 24 Jul 2010 15:49:13 +0000 (09:49 -0600)]
Conflicts:
arch/sparc/kernel/prom_64.c

1  2 
arch/microblaze/Kconfig
arch/powerpc/Kconfig
arch/powerpc/include/asm/irq.h
arch/powerpc/kernel/irq.c
arch/sparc/Kconfig
arch/sparc/kernel/prom_64.c
drivers/i2c/i2c-core.c
drivers/serial/sunsu.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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>
Simple merge
Simple merge