Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:39:59 +0000 (08:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:39:59 +0000 (08:39 -0700)
commitbf5cb66447e7d9f7f111c1d0ebb6d7c90ec24b4d
tree59d1cde4e83afd8768e866b8d4ed0c9d9b5ae29b
parent4efb686205d5065f4e488e20fc858446b8ad7bb7
parent77a9a768b7374cd23d1f400097eede9f1547f508
Merge branch 'x86-fixes-for-linus' of git://git./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