Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git...