Skip to content
Commit e9d728f5 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'rmobile/smp' into rmobile-latest 



Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-shmobile/include/mach/entry-macro-intc.S

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 018a3fc7 6155f77d
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