Merge branch 'sunxi-current' into sunxi

this marks the end of sunxi-current. from now on sunxi branch will
track upstream.