Skip to content
Commit 3ff32a0d authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel-stable' into for-linus 

Conflicts:
	drivers/perf/arm_pmu.c
parents 40d3f028 81497953
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