Merge branch 'allwinner-sunxi' into devel