Merge branch 'master' of git.linuxfoundation.org:ltsi-kernel