starred/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-04-23 22:53:07 +00:00
Code Issues 2 Packages Projects Releases Wiki Activity
Files
a1870b9cc280fe16fed13994810f8a1687be3bcf
linux-legacy/kernel/timer.c
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

42 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink