Merge branch 'linus' into x86/mce3 (0d595972) · Commits · github.com / kvm-riscv / linux

Commit 0d595972 authored Jun 11, 2009 by

Ingo Molnar

Merge branch 'linus' into x86/mce3



Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

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

parents 62fdac59 512626a0

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment