projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d77bdc4 9e9006e)
Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:52:01 +0000 (13:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:52:01 +0000 (13:52 -0700)
commitcca8209ed962f87990345ba073979d2b55dd1187
tree7629ee8d3396396570bdc35cc4220322c18c71cctree | snapshot
parentd77bdc423d6d6efcd18d329bbf8eb9351953dd30commit | diff
parent9e9006e9090dc1f88d5127cb69f416013e7ecd60commit | diff
Merge branch 'x86-olpc-for-linus' of git://git./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
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/Makefile diff1 | diff2 | blob | history
John Crispins staging tree