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

Merge branch 'sh/pm-runtime' into sh-latest 



Conflicts:
	arch/sh/kernel/cpu/sh4a/clock-sh7723.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents a4d52473 d3442b2b
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