Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Mar 2010 18:15:45 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Mar 2010 18:15:45 +0000 (11:15 -0700)
* '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


Trivial merge