Merge tag 'v3.18-rockchip-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 20:01:33 +0000 (22:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 4 Sep 2014 20:01:33 +0000 (22:01 +0200)
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>
1  2 
arch/arm/boot/dts/rk3288.dtsi
arch/arm/boot/dts/rk3xxx.dtsi

Simple merge
Simple merge
This page took 0.028072 seconds and 5 git commands to generate.