Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6