Merge branch develop-3.10 into develop-3.10-next

diff --cc arch/arm/mach-rockchip/common.c
index 82b574275fc922739d4f0a319ef54f48e0a20c49,e2fa463f8c56a1ce065b94ac8dbd93ba5f8a5c22..a3d129a0a2728c9be80a85ce4a28e2d14ab37fea
--- 1/arch/arm/mach-rockchip/common.c
--- 2/arch/arm/mach-rockchip/common.c
+++ b/arch/arm/mach-rockchip/common.c
@@@ -21,11 -21,10 +21,12 @@@
  #include <linux/of_platform.h>
  #include <linux/of_fdt.h>
  #include <asm/cputype.h>
 +#ifdef CONFIG_CACHE_L2X0
  #include <asm/hardware/cache-l2x0.h>
 +#endif
  #include <linux/rockchip/common.h>
  #include <linux/rockchip/pmu.h>
+ #include <linux/memblock.h>
  #include "cpu_axi.h"
  #include "loader.h"
  #include "sram.h"

diff --cc drivers/clk/rockchip/clk-pll.c
Simple merge