From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Aug 2010 23:24:34 +0000 (-0700)
Subject: Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3cf8ad3394b8675e92a35c438f22341197535531;p=linux-beck.git

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: Constify an olpc_ofw() arg
  x86, olpc: Use pr_debug() for EC commands
  x86, olpc: Add comment about implicit optimization barrier
  x86, olpc: Add support for calling into OpenFirmware
---

3cf8ad3394b8675e92a35c438f22341197535531