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

Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest 



Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents cc9e4fed 43aa77f4 d06830e7
Expand all 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