Merge branch 'develop' of 192.168.1.29:/home/rockchip/kernel into develop