| commit | cca8209ed962f87990345ba073979d2b55dd1187 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 13:52:01 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 13:52:01 2010 -0700 |
| tree | 7629ee8d3396396570bdc35cc4220322c18c71cc | |
| parent | d77bdc423d6d6efcd18d329bbf8eb9351953dd30 [diff] | |
| parent | 9e9006e9090dc1f88d5127cb69f416013e7ecd60 [diff] |
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: 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