Skip to content
GitLab
Commit 4ec3eb13 authored by Russell King's avatar Russell King
Browse files

Merge branch 'smp' into misc 

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
parents 24056f52 15095bb0
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