update
Merge branch 'master' of https://github.com/buaaqbh/linux-imx6-solo
fixed some bug
update