Skip to content
GitLab
Commit 7b70c427 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel-stable' into devel 

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/kernel/setup.c
	arch/arm/mm/init.c
parents ceb0885d a20df564
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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