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

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

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc drivers/base/platform.c
Simple merge

diff --cc drivers/serial/sh-sci.c
Simple merge

diff --cc drivers/sh/intc.c
Simple merge