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