git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Arnd Bergmann <arnd@arndb.de>
	Thu, 4 Sep 2014 20:01:33 +0000 (22:01 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Thu, 4 Sep 2014 20:01:33 +0000 (22:01 +0200)
commit	8baebe30642e76a5209093e75c7bdb4c8b6394eb
tree	26a893d374941a32381fa90179875d2343f2a98c	tree \| snapshot (tar.gz zip)
parent	c30131cf20a5a917a13f4bdefd71f2a545cb3fe6	commit \| diff
parent	ac42f481b75b98076b47fac60796657508f80abe	commit \| diff

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

arch/arm/boot/dts/rk3288.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/rk3xxx.dtsi	diff1 \|	diff2 \|	blob \| history