aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-22 01:23:06 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
d461d26dde901b0523c46b0317e7fccf574a3933
lkl_linux/arch/x86/include/asm/hardirq.h
Ingo Molnar 0d5959723e 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>
2009-06-11 23:31:52 +02:00

1.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink