Merge branch 'x86/mce' into x86/urgent

Browse source

Merge reason: Leftover mini-topic from the merge window - merge it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

...

This commit is contained in:

Ingo Molnar 2009-12-15 20:33:51 +01:00

parent ab1eebe77d 6ac5c5310c

commit bf08b3b1a1

1 changed files with 12 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

arch/x86/kernel/cpu/mcheck/mce-inject.c

View file