Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6