Merge branch 'for-next/rockchip'
Conflicts:
	arch/arm/Kconfig
commit 55ab01c7ff16e5fcb2d91870d0ab84399512ee3f
2 parents 5c8ced1 + 84fcb04
@Sascha Hauer Sascha Hauer authored on 9 Mar 2015
Showing 37 changed files
View
Documentation/boards/rockchip.rst 0 → 100644
View
arch/arm/Kconfig
View
arch/arm/boards/radxa-rock/board.c
View
arch/arm/boards/radxa-rock/env/boot/mshc1 0 → 100644
View
arch/arm/boards/radxa-rock/env/boot/mshc1-old 0 → 100644
View
arch/arm/boards/radxa-rock/env/init/bootsource 0 → 100644
View
arch/arm/boards/radxa-rock/env/nv/hostname 0 → 100644
View
arch/arm/dts/rk3188-clocks.dtsi 100644 → 0
View
arch/arm/dts/rk3188-radxarock.dts
View
arch/arm/dts/rk3188.dtsi 100644 → 0
View
arch/arm/dts/rk3xxx.dtsi 100644 → 0
View
arch/arm/mach-rockchip/Makefile
View
arch/arm/mach-rockchip/include/mach/rockchip-pll.h 100644 → 0
View
arch/arm/mach-rockchip/pll.c 100644 → 0
View
drivers/clk/Makefile
View
drivers/clk/clk-composite.c 0 → 100644
View
drivers/clk/clk-divider.c
View
drivers/clk/clk-fractional-divider.c 0 → 100644
View
drivers/clk/clk-mux.c
View
drivers/clk/clk.c
View
drivers/clk/rockchip/Makefile
View
drivers/clk/rockchip/clk-cpu.c 0 → 100644
View
drivers/clk/rockchip/clk-pll.c 0 → 100644
View
drivers/clk/rockchip/clk-rk3188.c 0 → 100644
View
drivers/clk/rockchip/clk-rockchip.c 100644 → 0
View
drivers/clk/rockchip/clk.c 0 → 100644
View
drivers/clk/rockchip/clk.h 0 → 100644
View
drivers/mci/Kconfig
View
drivers/mci/dw_mmc.c
View
drivers/net/arc_emac.c
View
include/init.h
View
include/linux/barebox-wrapper.h
View
include/linux/clk.h
View
include/linux/gcd.h 0 → 100644
View
include/linux/kernel.h
View
lib/Makefile
View
lib/gcd.c 0 → 100644