Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'rmobile/mackerel' 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 0ae26c8c 25338f2e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment