From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 26 Apr 2010 07:08:27 +0000 (+0900)
Subject: Merge branch 'sh/stable-updates'
X-Git-Tag: v2.6.35-rc1~504^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e19553427c2e8fdb04fdd98e407164bb59a840ba;p=pandora-kernel.git

Merge branch 'sh/stable-updates'

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

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

e19553427c2e8fdb04fdd98e407164bb59a840ba
Reading git-diff-tree failed