update
Merge branch 'master' of https://github.com/olegk0/rk3x_kernel_3.0.36