torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-27 18:06:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
b45cc9eff72e0871ffb83ae32c3dbca382909706
linux/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