Merge tag 'sunxi-cleanup-for-3.10' of git://github.com/mripard/linux into next/cleanup