tree 29e146443430d934f076d89a4bbf035c33586aa9
parent 55065bc52795faae549abfb912aacc622dd63876
parent b5318d302f8a20eacbbfc01b0ee35b108085a363
author Linus Torvalds <torvalds@linux-foundation.org> 1294942512 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294942512 -0800

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

* 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, olpc: Speed up device tree creation during boot
  x86, olpc: Add OLPC device-tree support
  x86, of: Define irq functions to allow drivers/of/* to build on x86