git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 00:16:02 +0000 (11:16 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 8 Oct 2012 00:16:02 +0000 (11:16 +1100)
commit	beaf947a0283ff2eeae16af30459635647b9b32b
tree	ca4afca91286b6412279c4dcc3fd61442e78a666	tree \| snapshot
parent	53dda3a36f5c055a27027d0e4cf126d34bac4006	commit \| diff
parent	e2d3a35ee427aaba99b6c68a56609ce276c51270	commit \| diff

Merge remote-tracking branch 'mtd/master'

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

15 files changed:

arch/arm/boot/dts/imx51.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx53.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx51-imx53.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/mpc83xx_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdoops.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdpart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/ams-delta.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/davinci_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_ifc_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/mxc_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/orion_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/s3c2410.c	diff1 \|	diff2 \|	blob \| history
fs/jffs2/super.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

arch/arm/boot/dts/imx51.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx53.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx51-imx53.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/mpc83xx_defconfig	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdoops.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdpart.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/ams-delta.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/davinci_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_ifc_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/mxc_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/orion_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/s3c2410.c	diff1 \|	diff2 \|	blob \| history
fs/jffs2/super.c	diff1 \|	diff2 \|	blob \| history