]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/boards' into for-next
authorJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:28:24 +0000 (21:28 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:28:24 +0000 (21:28 +0000)
commitfaa7403b6bba3a2ef8114f60340b60cdc7c0b84e
tree42b403d13534dbb2fd42d13ded60f70a513a2e5e
parent7e5c420fd04910edc3c0ad2653dcfc103936d37c
parent5e9eaadb0b3fa8c12715d9761158ec328d7e9523
Merge branch 'mvebu/boards' into for-next

Conflicts:
arch/arm/boot/dts/kirkwood.dtsi
30 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-orion5x/edmini_v2-setup.c