Skip to content
Commit f78e8020 authored by Robert Richter's avatar Robert Richter
Browse files

Merge commit 'v2.6.27-rc5' into tip/oprofile 

Conflicts:
	arch/x86/oprofile/nmi_int.c
parents 4c168eaf 24342c34
Expand all 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