From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 20:52:01 +0000 (-0700)
Subject: Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cca8209ed962f87990345ba073979d2b55dd1187;p=openwrt%2Fstaging%2Fblogic.git

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

cca8209ed962f87990345ba073979d2b55dd1187