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

Merge commit 'v2.6.27-rc8' into oprofile



Conflicts:
	arch/x86/oprofile/nmi_int.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 45f197ad 94aca1da
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