Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 01:08:06 +0000 (18:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 01:08:06 +0000 (18:08 -0700)
commit08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86
tree0d087f009b80bdf54f22fdb78437af790c1afc27
parent13588209aa90d9c8e502750fc86160314555612f
parent5d94e81f69d4b1d1102d3ab557ce0a817c11fbbb
Merge branch 'x86-platform-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* '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
arch/x86/Kconfig
arch/x86/include/asm/setup.h
arch/x86/kernel/Makefile
arch/x86/kernel/head32.c
arch/x86/kernel/x86_init.c
arch/x86/platform/olpc/olpc_dt.c