Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 16 Jun 2011 06:12:08 +0000 (15:12 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 16 Jun 2011 06:12:08 +0000 (15:12 +0900)
commitd0459e1afa58a225f074d85226bf0d7b9e54eff3
tree97df2f4f5a073f423903d122b4e9f5fc31e0df1c
parent1f83812d61de8c09ad6ab6be29e0ebd0817d16f1
parent090b91805a97f58a7deff0f2b40aad1cc2f1b7e0
parent261a9af671a79b750cb170bac620601d686535c1
Merge branches 'common/dma' and 'sh/stable-updates' into sh-latest
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
drivers/dma/shdma.c