From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 14 Mar 2010 18:15:45 +0000 (-0700)
Subject: Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~24369
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bca14dd14f3b0c5e3e2d1d314679f85b67871365;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'core-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y
---

bca14dd14f3b0c5e3e2d1d314679f85b67871365