This set of patches remove Kconfig and code related to CONFIG_PPC_MERGE and !CONFIG_PPC_MERGE. There is some discussion about that one last use of !PPC_MERGE with respect to the 4xx MTD_NAND_NDFC driver. Paul, is this something you'd be willing to entertain for 2.6.27? - k