diff options
| author | Ingo Molnar <[email protected]> | 2012-09-19 15:01:50 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-09-19 15:01:50 +0000 |
| commit | 961ebea4ae68075bb5a0acc19f5852bed82bb877 (patch) | |
| tree | a90f9af971f42e9f13b8deae6a854545c140f6fc /fs/proc/array.c | |
| parent | Merge tag 'v3.6-rc6' into x86/mce (diff) | |
| parent | x86, MCE: Remove unused defines (diff) | |
| download | kernel-961ebea4ae68075bb5a0acc19f5852bed82bb877.tar.gz kernel-961ebea4ae68075bb5a0acc19f5852bed82bb877.zip | |
Merge tag 'ras_queue_for_3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Pull MCE changes from Borislav Petkov:
" Patch 1/2 which enables MCA by default because I still see bugreports
where CONFIG_X86_MCE is disabled and this is a bad idea so turning it on
by default makes sense to me. The second one is a trivial cleanup. "
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions