From: Arnd Bergmann Date: Thu, 4 Sep 2014 20:01:33 +0000 (+0200) Subject: Merge tag 'v3.18-rockchip-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8baebe30642e76a5209093e75c7bdb4c8b6394eb;p=deliverable%2Flinux.git Merge tag 'v3.18-rockchip-dma' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt Pull "rockchip dma support" from Heiko Stuebner: Enable the AMBA bus and add necessary dma-controller dts nodes * tag 'v3.18-rockchip-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add rk3066 and rk3188 dma controllers ARM: dts: rockchip: add rk3288 dma controllers ARM: rockchip: enable the AMBA bus Signed-off-by: Arnd Bergmann --- 8baebe30642e76a5209093e75c7bdb4c8b6394eb