tree 5332234b2dad07c03c27e4608afb16f297f41e61
parent 35f6cd4a06432034665a1499ca4b022437423aac
parent 83515bc7df812555e20cda48614674e2f346f9f5
author Paul Mundt <lethal@linux-sh.org> 1272265707 +0900
committer Paul Mundt <lethal@linux-sh.org> 1272265707 +0900

Merge branch 'sh/stable-updates'

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

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