Merge branch 'develop-3.10-next' of 10.10.10.29:rk/kernel into develop-3.10-next

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

diff --cc drivers/video/rockchip/rga/rga_drv.c
index d5857c9dac53c2ce1a764a5063965253337ff3cd,d081f0ca8c8ee35110c1ec7298cc95052ddaa8df..d897c8795619c72816e1115f7a934c8393977b66
--- 1/drivers/video/rockchip/rga/rga_drv.c
--- 2/drivers/video/rockchip/rga/rga_drv.c
+++ b/drivers/video/rockchip/rga/rga_drv.c
@@@ -633,15 -635,11 +633,15 @@@ static void rga_try_set_reg(void
  
              rga_copy_reg(reg, 0);
              rga_reg_from_wait_to_run(reg);
 -
 +\r
 +            #ifdef CONFIG_ARM\r
              dmac_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]);
 -            outer_flush_range(virt_to_phys(&rga_service.cmd_buff[0]),virt_to_phys(&rga_service.cmd_buff[28]));
 +            outer_flush_range(virt_to_phys(&rga_service.cmd_buff[0]),virt_to_phys(&rga_service.cmd_buff[28]));\r
 +            #elif defined(CONFIG_ARM64)\r
 +            __dma_flush_range(&rga_service.cmd_buff[0], &rga_service.cmd_buff[28]);\r
 +            #endif\r
  
-             #if defined(CONFIG_ARCH_RK30)
+             #if 1 
              rga_soft_reset();
              #endif