| commit | bca14dd14f3b0c5e3e2d1d314679f85b67871365 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 14 11:15:45 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Mar 14 11:15:45 2010 -0700 |
| tree | e2da281ecf99e9ea009c71cea947440d2b06afed | |
| parent | 02ca6c407e0d43e6de5d646d26d87fc2eaa7a98b [diff] | |
| parent | 2aa2b50dd62b5d0675bd7453fbeb5732dc2d7866 [diff] |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/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