Merge tag 'v3.18-rockchip-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...

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 <arnd@arndb.de>

diff --cc arch/arm/boot/dts/rk3288.dtsi
Simple merge

diff --cc arch/arm/boot/dts/rk3xxx.dtsi
Simple merge