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