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