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

Merge branch 'devel-stable' into for-next 

Conflicts:
	arch/arm/kernel/entry-armv.S
parents 06f365ac 6645cb61
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