tree 0d087f009b80bdf54f22fdb78437af790c1afc27
parent 13588209aa90d9c8e502750fc86160314555612f
parent 5d94e81f69d4b1d1102d3ab557ce0a817c11fbbb
author Linus Torvalds <torvalds@linux-foundation.org> 1305853686 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305853686 -0700

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