Skip to content
Commit 3ac3ba0b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core 

Conflicts:
	kernel/Makefile
parents 934352f2 7f0f598a
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