Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6