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

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

Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen 



Conflicts:
	arch/arm/mach-shmobile/clock-sh73a0.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 04cf3996 e499ada8 2dacb97d
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