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

Conflicts:
	arch/sparc/kernel/prom_64.c

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/irq.h
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/sparc/kernel/prom_64.c
index 0bffafdee35070e2dad9d1b746e5554be78b9526,466a32763ea82fbe0bd644fb5468459a7fe4196f..86597d9867fd3768dcca56ec3a9263db1deed6fc
--- 1/arch/sparc/kernel/prom_64.c
--- 2/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>

diff --cc drivers/i2c/i2c-core.c
Simple merge

diff --cc drivers/serial/sunsu.c
Simple merge