Skip to content
Commit 968ea6d8 authored by Rusty Russell's avatar Rusty Russell
Browse files

Merge ../linux-2.6-x86 

Conflicts:

	arch/x86/kernel/io_apic.c
	kernel/sched.c
	kernel/sched_stats.h
parents 7be75853 8299608f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment