Merge branch 'for-next/marvell'
Conflicts:
	arch/arm/boards/Makefile
	arch/arm/dts/Makefile
commit 6724928c6972842b73962dc5af70d26de9969582
2 parents 8da9a22 + 02e14a6
@Sascha Hauer Sascha Hauer authored on 4 Jul 2014
Showing 44 changed files
View
arch/arm/Kconfig
View
arch/arm/Makefile
View
arch/arm/boards/Makefile
View
arch/arm/boards/globalscale-guruplug/Makefile
View
arch/arm/boards/globalscale-guruplug/lowlevel.c 0 → 100644
View
arch/arm/boards/globalscale-mirabox/Makefile
View
arch/arm/boards/globalscale-mirabox/kwbimage.cfg
View
arch/arm/boards/globalscale-mirabox/lowlevel.c 0 → 100644
View
arch/arm/boards/marvell-armada-xp-gp/Makefile
View
arch/arm/boards/marvell-armada-xp-gp/kwbimage.cfg
View
arch/arm/boards/marvell-armada-xp-gp/lowlevel.c 0 → 100644
View
arch/arm/boards/plathome-openblocks-ax3/Makefile
View
arch/arm/boards/plathome-openblocks-ax3/kwbimage.cfg
View
arch/arm/boards/plathome-openblocks-ax3/lowlevel.c 0 → 100644
View
arch/arm/boards/usi-topkick/Makefile
View
arch/arm/boards/usi-topkick/lowlevel.c 0 → 100644
View
arch/arm/dts/Makefile
View
arch/arm/dts/armada-370-mirabox-bb.dts 0 → 100644
View
arch/arm/dts/armada-xp-gp-bb.dts 0 → 100644
View
arch/arm/dts/armada-xp-openblocks-ax3-4-bb.dts 0 → 100644
View
arch/arm/dts/kirkwood-guruplug-server-plus-bb.dts 0 → 100644
View
arch/arm/dts/kirkwood-topkick-bb.dts 0 → 100644
View
arch/arm/mach-mvebu/Kconfig
View
arch/arm/mach-mvebu/Makefile
View
arch/arm/mach-mvebu/armada-370-xp.c
View
arch/arm/mach-mvebu/common.c
View
arch/arm/mach-mvebu/dove.c
View
arch/arm/mach-mvebu/include/mach/mvebu.h 100644 → 0
View
arch/arm/mach-mvebu/include/mach/socid.h 0 → 100644
View
arch/arm/mach-mvebu/kirkwood.c
View
arch/arm/mach-mvebu/lowlevel.c
View
drivers/clk/mvebu/armada-370.c
View
drivers/clocksource/mvebu.c
View
drivers/of/Kconfig
View
drivers/of/address.c
View
drivers/pinctrl/Kconfig
View
drivers/pinctrl/Makefile
View
drivers/pinctrl/mvebu/Kconfig 0 → 100644
View
drivers/pinctrl/mvebu/Makefile 0 → 100644
View
drivers/pinctrl/mvebu/common.c 0 → 100644
View
drivers/pinctrl/mvebu/common.h 0 → 100644
View
drivers/pinctrl/mvebu/dove.c 0 → 100644
View
drivers/pinctrl/mvebu/kirkwood.c 0 → 100644
View
images/Makefile.mvebu