Ingo Molnar 940010c5a3 Merge branch 'linus' into perfcounters/core ...

Conflicts:
	arch/x86/kernel/irqinit.c
	arch/x86/kernel/irqinit_64.c
	arch/x86/kernel/traps.c
	arch/x86/mm/fault.c
	include/linux/sched.h
	kernel/exit.c

2009-06-11 17:55:42 +02:00

13 KiB

Raw Permalink Blame History

View Raw