Merge branch 'next/fixes-non-critical' into for-next

* next/fixes-non-critical:
  ARM: sunxi: fix build error