Merge branch 'for-next/marvell'
Conflicts:
	arch/arm/dts/Makefile
commit 2331b1d8e8d7aabe52b4fd65ca200cf8288aec88
2 parents 9c2aa61 + b3cd257
@Sascha Hauer Sascha Hauer authored on 7 Mar 2014
Showing 20 changed files
View
arch/arm/Kconfig
View
arch/arm/boards/solidrun-cubox/lowlevel.c
View
arch/arm/dts/Makefile
View
arch/arm/dts/dove-cubox-bb.dts 0 → 100644
View
arch/arm/dts/dove-cubox.dts
View
arch/arm/dts/dove.dtsi
View
drivers/bus/Kconfig
View
drivers/bus/Makefile
View
drivers/bus/mvebu-mbus.c 0 → 100644
View
drivers/net/Kconfig
View
drivers/net/Makefile
View
drivers/net/orion-gbe.c 0 → 100644
View
drivers/net/orion-gbe.h 0 → 100644
View
drivers/net/phy/Kconfig
View
drivers/net/phy/Makefile
View
drivers/net/phy/mdio-mvebu.c 0 → 100644
View
drivers/net/phy/phy.c
View
include/linux/mbus.h 0 → 100644
View
include/linux/phy.h
View
scripts/kwbimage.c