From: Arnd Bergmann Date: Mon, 24 Jun 2013 14:46:23 +0000 (+0200) Subject: Merge tag 'davinci-for-v3.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8ecb6ca61ac673f3712f82259de5b0a25d21d532;p=deliverable%2Flinux.git Merge tag 'davinci-for-v3.11/soc-2' of git://git./linux/kernel/git/nsekhar/linux-davinci into next/soc From Sekhar Nori: DaVinci SoC updates for v3.11 - part 2 This pull request adds DT and runtime PM to EDMA ARM private API so it can be used on DT enabled DaVinci and OMAP platforms. Also adds DMA channel crossbar mapping support to be used by DT-enabled platforms which use it. * tag 'davinci-for-v3.11/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: dmaengine: edma: enable build for AM33XX ARM: edma: Add EDMA crossbar event mux support ARM: edma: Add DT and runtime PM support to the private EDMA API dmaengine: edma: Add TI EDMA device tree binding ARM: edma: Convert to devm_* api Signed-off-by: Arnd Bergmann --- 8ecb6ca61ac673f3712f82259de5b0a25d21d532