git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Paul Mundt <lethal@linux-sh.org>
	Mon, 26 Apr 2010 07:08:27 +0000 (16:08 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Mon, 26 Apr 2010 07:08:27 +0000 (16:08 +0900)
commit	e19553427c2e8fdb04fdd98e407164bb59a840ba
tree	5332234b2dad07c03c27e4608afb16f297f41e61	tree \| snapshot (tar.gz zip)
parent	35f6cd4a06432034665a1499ca4b022437423aac	commit \| diff
parent	83515bc7df812555e20cda48614674e2f346f9f5	commit \| diff

Merge branch 'sh/stable-updates'

Conflicts:
arch/sh/kernel/dwarf.c
drivers/dma/shdma.c

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

arch/sh/include/cpu-sh4/cpu/dma-register.h	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/dwarf.c	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/sh/mm/pmb.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/sh_cmt.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/sh_mtu2.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/sh_tmu.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/shdma.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sh-sci.c	diff1 \|	diff2 \|	blob \| history
drivers/sh/intc.c	diff1 \|	diff2 \|	blob \| history

arch/sh/include/cpu-sh4/cpu/dma-register.h	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/dwarf.c	diff1 \|	diff2 \|	blob \| history
arch/sh/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/sh/mm/pmb.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/sh_cmt.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/sh_mtu2.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/sh_tmu.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/shdma.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/sh-sci.c	diff1 \|	diff2 \|	blob \| history
drivers/sh/intc.c	diff1 \|	diff2 \|	blob \| history