]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'omap_dss2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:38:15 +0000 (13:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:38:15 +0000 (13:38 +1000)
commita9e747e7ca45a3f11c04c52f1c9fffbf315b7724
tree580b0d63ca0b1cf48702c1640a084d1661833a2b
parent9030b834e515b1204caf5bbe1a92e3bd4926e2ef
parente1f0cbfb460323086a648c93d90713bb881d9bfc
Merge remote-tracking branch 'omap_dss2/for-next'

Conflicts:
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am437x-gp-evm.dts
arch/arm/boot/dts/omap3-evm-37xx.dts
arch/arm/boot/dts/omap3-ldp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
include/linux/omap-dma.h