tes
Merge branch 'master' of https://github.com/michalliu/CubieDebian

Conflicts:
	linux-sunxi