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