Skip to content
Commit 27a513ca authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel-stable' into for-next 

Conflicts:
	arch/arm/kernel/perf_event_cpu.c
parents 970d96f9 bcc8fa83
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment