arch/arm/mach-imx/clk-imx51-imx53.c · 10f39f04b2cb7a06ba5d4ea0f20bd156d0367bee · Kirill Smelkov / linux

Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers · ffe31501

David Woodhouse authored Oct 09, 2012

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c

ffe31501

clk-imx51-imx53.c 29.3 KB

Replace clk-imx51-imx53.c