Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel...