]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2b3062b0e818fbb7518981dd9819b813ce29fee2
tree0d087f009b80bdf54f22fdb78437af790c1afc27
parentf607bad01682f1073bf4f945e54dcf56824edb15
parentb9dcac6413eddc5456a5c94b30c40ae61cd2681c
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/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