Merge branch 'for-next/marvell'
Conflicts:
	arch/arm/boards/Makefile
	arch/arm/dts/Makefile
commit 07afe7d0e00a9e14c5918a887161e6ccce542165
2 parents b1aae79 + 6f6e137
@Sascha Hauer Sascha Hauer authored on 5 Aug 2013
Showing 36 changed files
View
arch/arm/Kconfig
View
arch/arm/boards/Makefile
View
arch/arm/boards/usi-topkick/Makefile 0 → 100644
View
arch/arm/boards/usi-topkick/board.c 0 → 100644
View
arch/arm/boards/usi-topkick/kwbimage.cfg 0 → 100644
View
arch/arm/configs/solidrun_cubox_defconfig
View
arch/arm/dts/Makefile
View
arch/arm/dts/dove-cubox.dts 0 → 100644
View
arch/arm/dts/dove.dtsi 0 → 100644
View
arch/arm/mach-mvebu/Kconfig
View
arch/arm/mach-mvebu/armada-370-xp.c
View
arch/arm/mach-mvebu/dove.c
View
arch/arm/mach-mvebu/include/mach/dove-regs.h
View
arch/arm/mach-mvebu/include/mach/gpio.h 0 → 100644
View
arch/arm/mach-mvebu/kirkwood.c
View
commands/of_node.c
View
commands/oftree.c
View
drivers/clocksource/mvebu.c
View
drivers/clocksource/orion.c
View
drivers/gpio/Kconfig
View
drivers/gpio/Makefile
View
drivers/gpio/gpio-orion.c 0 → 100644
View
drivers/of/Makefile
View
drivers/of/address.c 0 → 100644
View
drivers/of/base.c
View
drivers/of/fdt.c
View
drivers/of/gpio.c 100644 → 0
View
drivers/of/of_gpio.c 0 → 100644
View
drivers/of/platform.c 0 → 100644
View
drivers/spi/Kconfig
View
drivers/spi/Makefile
View
drivers/spi/imx_spi.c
View
drivers/spi/mvebu_spi.c 0 → 100644
View
include/of.h
View
include/of_address.h 0 → 100644
View
include/of_gpio.h 0 → 100644