Merge branch 'develop-3.0' of ssh://192.168.1.29/rk/kernel into develop-3.0