]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/mbus_dt' into mvebu/dove_pcie-mbus-dt
authorJason Cooper <jason@lakedaemon.net>
Tue, 13 Aug 2013 18:19:21 +0000 (18:19 +0000)
committerJason Cooper <jason@lakedaemon.net>
Tue, 13 Aug 2013 18:19:21 +0000 (18:19 +0000)
commite8b948e25c180fb3119cb58a33c956e988569302
tree2035660e931dd0ea1fad166844924a59d0b35fd4
parent5e9eaadb0b3fa8c12715d9761158ec328d7e9523
parenta0cec7867ffdf5d153d29b3a8243911ea8dfd366
Merge branch 'mvebu/mbus_dt' into mvebu/dove_pcie-mbus-dt

Conflicts:
arch/arm/boot/dts/kirkwood.dtsi
31 files changed:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/kirkwood-cloudbox.dts
arch/arm/boot/dts/kirkwood-db.dtsi
arch/arm/boot/dts/kirkwood-dnskw.dtsi
arch/arm/boot/dts/kirkwood-dockstar.dts
arch/arm/boot/dts/kirkwood-dreamplug.dts
arch/arm/boot/dts/kirkwood-goflexnet.dts
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
arch/arm/boot/dts/kirkwood-ib62x0.dts
arch/arm/boot/dts/kirkwood-iconnect.dts
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
arch/arm/boot/dts/kirkwood-is2.dts
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
arch/arm/boot/dts/kirkwood-lsxl.dtsi
arch/arm/boot/dts/kirkwood-mplcec4.dts
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
arch/arm/boot/dts/kirkwood-ns2.dts
arch/arm/boot/dts/kirkwood-ns2lite.dts
arch/arm/boot/dts/kirkwood-ns2max.dts
arch/arm/boot/dts/kirkwood-ns2mini.dts
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
arch/arm/boot/dts/kirkwood-topkick.dts
arch/arm/boot/dts/kirkwood-ts219-6281.dts
arch/arm/boot/dts/kirkwood-ts219-6282.dts
arch/arm/boot/dts/kirkwood-ts219.dtsi
arch/arm/boot/dts/kirkwood.dtsi
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-mvebu/platsmp.c
arch/arm/mach-orion5x/edmini_v2-setup.c