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