From: Linus Torvalds Date: Fri, 27 Apr 2007 22:34:57 +0000 (-0700) Subject: Merge git://git.infradead.org/mtd-2.6 X-Git-Tag: v2.6.22-rc1~1116 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f00546363fff1576ceddc2690d47e5f9c1dd2e05;p=platform%2Fkernel%2Flinux-3.10.git Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: (46 commits) [MTD] [MAPS] drivers/mtd/maps/ck804xrom.c: convert pci_module_init() [MTD] [NAND] CM-x270 MTD driver [MTD] [NAND] Wrong calculation of page number in nand_block_bad() [MTD] [MAPS] fix plat-ram printk format [JFFS2] Fix compr_rubin.c build after include file elimination. [JFFS2] Handle inodes with only a single metadata node with non-zero isize [JFFS2] Tidy up licensing/copyright boilerplate. [MTD] [OneNAND] Exit loop only when column start with 0 [MTD] [OneNAND] Fix access the past of the real oobfree array [MTD] [OneNAND] Update Samsung OneNAND official URL [JFFS2] Better fix for all-zero node headers [JFFS2] Improve read_inode memory usage, v2. [JFFS2] Improve failure mode if inode checking leaves unchecked space. [JFFS2] Fix cross-endian build. [MTD] Finish conversion mtd_blkdevs to use the kthread API [JFFS2] Obsolete dirent nodes immediately on unlink, where possible. Use menuconfig objects: MTD [MTD] mtd_blkdevs: Convert to use the kthread API [MTD] Fix fwh_lock locking [JFFS2] Speed up mount for directly-mapped NOR flash ... --- f00546363fff1576ceddc2690d47e5f9c1dd2e05