]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc041a1 e2d3a35)
Merge remote-tracking branch 'mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:43:11 +0000 (11:43 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Oct 2012 01:43:11 +0000 (11:43 +1000)
commitca5a65e92e385d72831cc7d827444889e9ac3663
treef7d720bcf8b430fa1ccb5de39832a19fa13c9fb0tree | snapshot
parentfc041a10f3f76bd83a01d004e79b0bd425367324commit | diff
parente2d3a35ee427aaba99b6c68a56609ce276c51270commit | 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