Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 23:24:34 +0000 (16:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 23:24:34 +0000 (16:24 -0700)
commit3cf8ad3394b8675e92a35c438f22341197535531
tree39c9c5b9465e4f63f6cdf9b767d8046eaf0f3ac7
parent66cd55d2b903643cbd019ef97a5305d9428d3865
parent54e5bc020ce1c959eaa7be18cedb734b6b13745e
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: 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
arch/x86/Kconfig