From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 01:08:06 +0000 (-0700)
Subject: Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.0-rc1~395
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

08b5d06ec6cff1d952f13cfcffcbf41ff0ce2c86