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

Merge commit 'v2.6.28-rc2' into core/locking

Conflicts:
	arch/um/include/asm/system.h
parents c7e78cff 0173a326
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