diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-19 17:01:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-19 17:01:50 +0200 |
| commit | 961ebea4ae68075bb5a0acc19f5852bed82bb877 (patch) | |
| tree | a90f9af971f42e9f13b8deae6a854545c140f6fc /include/linux/timerqueue.h | |
| parent | f1f652447694f92beff8a534d94b36ea441c939a (diff) | |
| parent | 57639bedd2b8268daa791efcfd0367b9031b057d (diff) | |
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 <mingo@kernel.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions