Merge branch 'for-next/imx-bbu-nand-fcb'
Conflicts:
	common/Kconfig
commit c5438404db8c8fecff2cd9791b8e0debe679f0d7
2 parents e5ed4be + 6ab6678
@Sascha Hauer Sascha Hauer authored on 3 Jul 2015
Showing 12 changed files
View
arch/arm/dts/imx6dl-tx6u-801x.dts
View
arch/arm/mach-imx/Kconfig
View
arch/arm/mach-imx/Makefile
View
arch/arm/mach-imx/imx6-bbu-nand.c 100644 → 0
View
arch/arm/mach-imx/include/mach/bbu.h
View
common/Kconfig
View
common/Makefile
View
common/filetype.c
View
common/imx-bbu-nand-fcb.c 0 → 100644
View
drivers/mtd/partition.c
View
include/bbu.h
View
include/filetype.h