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