]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 18:15:12 +0000 (10:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 18:15:12 +0000 (10:15 -0800)
* '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

1  2 
arch/x86/Kconfig
arch/x86/include/asm/irq.h
arch/x86/kernel/irq.c
arch/x86/mm/init_32.c

Simple merge
Simple merge
Simple merge
Simple merge