Merge branch 'rmobile/dma' into rmobile-fixes-for-linus
authorPaul Mundt <lethal@linux-sh.org>
Mon, 29 Aug 2011 07:10:24 +0000 (16:10 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 29 Aug 2011 07:10:24 +0000 (16:10 +0900)
commit8a1c049aa9d31710dac5a794b47be5a081a886e4
treee4512cf806af87ba69291ba10b72fddf7b97bd77
parentfe43756143c4efa6f8fdef07aa3ca4dc0be24ada
parentafe48049ab1d0ca83afe45f9d5116bf4507741eb
Merge branch 'rmobile/dma' into rmobile-fixes-for-linus
arch/arm/mach-shmobile/clock-sh7372.c
arch/arm/mach-shmobile/include/mach/sh7372.h
arch/arm/mach-shmobile/setup-sh7372.c