Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop