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: XO-1 uses/depends on PCI
  x86, olpc: Register XO-1 platform devices
  x86, olpc: Add XO-1 poweroff support
  x86, olpc: Don't retry EC commands forever
  x86, olpc: Rework BIOS signature check
  x86, olpc: Only enable PCI configuration type override on XO-1

...

This commit is contained in:

Linus Torvalds 2010-10-21 13:52:01 -07:00

parent d77bdc423d 9e9006e909

commit cca8209ed9

7 changed files with 216 additions and 37 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

11

arch/x86/Kconfig

View file

4

arch/x86/include/asm/olpc_ofw.h

View file

1

arch/x86/kernel/Makefile

View file

140

arch/x86/kernel/olpc-xo1.c

View file

91

arch/x86/kernel/olpc.c

View file

6

arch/x86/kernel/olpc_ofw.c

View file

2

arch/x86/pci/olpc.c

View file