Merge branch 'for-next/omap'
|
---|
arch/arm/mach-omap/am33xx_bbu_nand.c |
---|
arch/arm/mach-omap/am35xx_emif4.c |
---|
arch/arm/mach-omap/include/mach/bbu.h |
---|
arch/arm/mach-omap/include/mach/gpmc_nand.h |
---|
drivers/bus/omap-gpmc.c |
---|
drivers/mtd/nand/Kconfig |
---|
drivers/mtd/nand/Makefile |
---|
drivers/mtd/nand/nand_omap_gpmc.c |
---|
drivers/mtd/nand/omap_elm.c 0 → 100644 |
---|
drivers/mtd/peb.c |
---|
drivers/net/cpsw.c |
---|
include/linux/mtd/mtd-abi.h |
---|
include/mtd/mtd-peb.h |
---|
include/platform_data/elm.h 0 → 100644 |
---|