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)
1  2  3 
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
drivers/dma/shdma.c

Simple merge