From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Sep 2008 15:39:59 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.27-rc8~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bf5cb66447e7d9f7f111c1d0ebb6d7c90ec24b4d;p=~emulex%2Finfiniband.git

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: disable apm on the olpc
---

bf5cb66447e7d9f7f111c1d0ebb6d7c90ec24b4d