Merge branch 'x86/mce' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 12:12:06 +0000 (14:12 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 12:12:06 +0000 (14:12 +0200)
commit403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307
treec1f762dda525faf24aa10d6f81cf043da202c54f
parentfa83523f45fbb403eba4ebc5704bf98aa4da0163
parent80f033610fb968e75f5d470233d8d0260d7a72ed
Merge branch 'x86/mce' into x86/urgent

Merge in these fixlets.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/mcheck/mce.c