Merge tag 'u300-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/linus...