Merge branch 'rk_develop-3.10' into rk_develop-3.10-next

Conflicts:
	drivers/mmc/host/rk_sdmmc.c

diff --cc arch/arm/boot/dts/rk3036.dtsi
Simple merge

diff --cc arch/arm/boot/dts/rk312x.dtsi
Simple merge

diff --cc drivers/media/video/rk_camsys/camsys_internal.h
Simple merge

diff --cc drivers/mmc/host/rk_sdmmc.c
index 1276d727e6807981f1928017ded8cb3e3b3dd68a,e4488a8de558e6f94202c398b9a860fb1a5dfdd7..ae0a86ccdec8fe849b8c414e5f277a7413f26c50
--- 1/drivers/mmc/host/rk_sdmmc.c
--- 2/drivers/mmc/host/rk_sdmmc.c
+++ b/drivers/mmc/host/rk_sdmmc.c
@@@ -46,8 -46,7 +46,9 @@@
  #include <linux/clk-private.h>
  #include <linux/rockchip/cpu.h>
  #include <linux/rfkill-wlan.h>
 +#include <linux/mfd/syscon.h>
 +#include <linux/regmap.h>
+ #include <linux/log2.h>
  #include "rk_sdmmc.h"
  #include "rk_sdmmc_dbg.h"
  #include <linux/regulator/rockchip_io_vol_domain.h>