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

Merge branches 'sh/intc-extension', 'sh/dmaengine', 'sh/serial-dma' and 'sh/clkfwk' 



Conflicts:
	arch/sh/kernel/cpu/clock.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 6ae66502 dec710b7 3089f381 f4cff0d0
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