From: Arnd Bergmann Date: Thu, 20 Jun 2013 13:06:57 +0000 (+0200) Subject: Merge tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.12-rc1~552^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0639948b6fb28ebf2063b58ae6e0f4de693f6c3;p=kernel%2Fkernel-generic.git Merge tag 'davinci-for-v3.11/soc-v2' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/soc From Sekhar Nori: DaVinci SoC changes for v3.11 This pull request moves DaVinci EDMA library to arch/arm/common so it can be used by OMAP based AM335x. This is a temporary step until all drivers are converted to use the dmaengine driver in drivers/dma/edma.c. Several drivers like SPI, MMC/SD have already been converted. Some like audio are pending. The other two patches in the pull request are cleanup in nature. * tag 'davinci-for-v3.11/soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: edma: remove unused transfer controller handlers ARM: davinci: move private EDMA API to arm/common ARM: davinci: remove __init atrribute from function declaration Signed-off-by: Arnd Bergmann --- a0639948b6fb28ebf2063b58ae6e0f4de693f6c3