tree 59d1cde4e83afd8768e866b8d4ed0c9d9b5ae29b
parent 4efb686205d5065f4e488e20fc858446b8ad7bb7
parent 77a9a768b7374cd23d1f400097eede9f1547f508
author Linus Torvalds <torvalds@linux-foundation.org> 1222702799 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1222702799 -0700

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