Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2...