Merge branch 'master' of ssh://git.infradead.org/srv/git/mtd-2.6