David Woodhouse ffe3150125 Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers ...

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

2012-10-09 15:04:25 +01:00

21 KiB

Raw Blame History

View Raw