From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Jul 2010 00:31:11 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc6~43
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bcefc8d0d3a0cba9078f519d69f138b93ad30e39;p=~shefty%2Frdma-dev.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:
  input: i8042 - add runtime check in x86's i8042_platform_init
  Revert "Input: fixup X86_MRST selects"
  Revert "Input: do not force selecting i8042 on Moorestown"
  x86, mrst: Add i8042_detect API for Moorestwon platform
  x86: Add i8042 pre-detection hook to x86_platform_ops
  x86, platform: Export x86_platform to modules
---

bcefc8d0d3a0cba9078f519d69f138b93ad30e39