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

Browse source

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

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

...

This commit is contained in:

Paul Mundt 2010-03-30 11:26:43 +09:00

parent 6ae6650232 dec710b77c 3089f381fb f4cff0d0ff

commit 720fcb36ac

52 changed files with 863 additions and 697 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

drivers/base/platform.c

View file

42

drivers/clocksource/sh_cmt.c

View file

34

drivers/clocksource/sh_mtu2.c

View file

38

drivers/clocksource/sh_tmu.c

View file

13

drivers/dma/shdma.c

View file

4

drivers/dma/shdma.h

View file

189

drivers/serial/sh-sci.c

View file

95

drivers/sh/intc.c

View file