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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2011-01-13 10:15:12 -08:00

parent 55065bc527 b5318d302f

commit e691d24e9c

9 changed files with 220 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/x86/Kconfig

View file

3

arch/x86/include/asm/irq.h

View file

9

arch/x86/include/asm/olpc_ofw.h

View file

1

arch/x86/include/asm/prom.h

View file

10

arch/x86/kernel/irq.c

View file

2

arch/x86/mm/init_32.c

View file

1

arch/x86/platform/olpc/Makefile

View file

183

arch/x86/platform/olpc/olpc_dt.c

View file

5

arch/x86/platform/olpc/olpc_ofw.c

View file