Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next

Conflicts:
	drivers/mmc/host/Kconfig
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.h
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
	drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.h
	include/linux/mmc/rk_mmc.h
	include/linux/rockchip/cru.h

diff --cc arch/arm/configs/rockchip_defconfig
Simple merge

diff --cc arch/arm/mach-rockchip/Makefile
Simple merge

diff --cc drivers/clk/rockchip/clk-pll.c
index d1dcfa2e3ed583993b8e9fb0defd778054322fc8,e4a0b4866cf9beb653c7e113b2b242a930c520ce..dee39a0edebe520d0383e81a3083a2dec45e42c2
mode 100755,100644..100755
--- 1/drivers/clk/rockchip/clk-pll.c
--- 2/drivers/clk/rockchip/clk-pll.c
+++ b/drivers/clk/rockchip/clk-pll.c

diff --cc drivers/video/rockchip/rk_fb.c
Simple merge

diff --cc include/dt-bindings/clock/rockchip.h
Simple merge

diff --cc include/linux/rockchip/cru.h
Simple merge