Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, olpc: Speed up device tree creation during boot
  x86, olpc: Add OLPC device-tree support
  x86, of: Define irq functions to allow drivers/of/* to build on x86

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc arch/x86/mm/init_32.c
Simple merge