Merge branch 'opp/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk...