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

Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest 



Conflicts:
	arch/arm/mach-shmobile/Kconfig

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 6bf45a10 f7dd3611 c070c203 d0fb0c4b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment