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

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Introduce pci_map_biosrom()
  x86, olpc: Use device tree for platform identification

diff --cc arch/x86/Kconfig
Simple merge

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

diff --cc arch/x86/kernel/Makefile
Simple merge

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

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

diff --cc arch/x86/platform/olpc/olpc_dt.c
Simple merge