]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d0fa8f 282cb52)
Merge remote-tracking branch 'l2-mtd/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 01:18:18 +0000 (11:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 01:18:18 +0000 (11:18 +1000)
Conflicts:
drivers/dma/mxs-dma.c
drivers/mmc/host/mxs-mmc.c
drivers/mtd/devices/spear_smi.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/atmel_nand.c
drivers/mtd/nand/docg4.c
drivers/mtd/nand/gpmi-nand/gpmi-lib.c
fs/jffs2/fs.c
include/linux/mtd/spear_smi.h
sound/soc/mxs/mxs-pcm.h


Trivial merge
Linux kernel for KaRo TX COM modules