From: Linus Torvalds Date: Fri, 9 Mar 2007 18:34:55 +0000 (-0800) Subject: Merge git://git.infradead.org/mtd-2.6 X-Git-Tag: v2.6.21-rc4~69 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6e96783f586cc0a64651087cb518209a8577123f;p=linux-2.6-omap-h63xx.git Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: [JFFS2] print a message when marking bad block [JFFS2] Check for all-zero node headers [MTD] [OneNAND] Classify the page data and oob buffer [MTD] [OneNAND] Exit the loop when transferring/filling of the oob is finished [MTD] [OneNAND] add Nokia Copyright and a credit [MTD] [OneNAND] Fix typo & wrong comments [MTD] [OneNAND] Use oob buffer instead of main one in oob functions [MTD] Correct partition failed erase address [JFFS2] Use yield() between GC passes in background thread. [MTD] [NAND] Correct misspelled preprocessor variable. [MTD] [MAPS] dilnetpc: Fix printk warning [MTD] [NOR] Fix oops in cfi_amdstd_sync [MTD] ESB2 check for closed ROM window [JFFS2] Fix writebuffer recovery in the first page of a block [MTD] [NAND] make oobavail public --- 6e96783f586cc0a64651087cb518209a8577123f