Public Git Hosting - barebox-mini2440.git/commit

commit	40a5f3de4e19d43fd34ddd0d81542f73ec64a287
author	Sascha Hauer <s.hauer@pengutronix.de>
	Wed, 28 Oct 2009 09:10:56 +0000 (28 10:10 +0100)
committer	Sascha Hauer <s.hauer@pengutronix.de>
	Wed, 28 Oct 2009 09:10:56 +0000 (28 10:10 +0100)
tree	0ecbebaaa9ddec5dce11382cfce8b473517b4ae6	tree \| snapshot (tar.gz zip)
parent	5b28d03dbbfda2409a8bff4b77d5f38824a74782	commit \| diff
parent	daad436bf76ad8acdf66326b1cc3769434cca97f	commit \| diff

Merge branch 'for-sascha' of git://uboot.jcrosoft.org/u-boot-v2 into from-jean

Conflicts:
board/a9m2440/a9m2440.c
board/pcm043/pcm043.c
drivers/nand/nand_imx.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

17 files changed:

arch/arm/mach-imx/include/mach/imx-nand.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/include/mach/imx25-regs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/include/mach/imx35-regs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h	diff1 \|	diff2 \|	blob \| history
board/a9m2440/a9m2440.c	diff1 \|	diff2 \|	blob \| history
board/a9m2440/lowlevel_init.S	diff1 \|	diff2 \|	blob \| history
board/eukrea_cpuimx27/eukrea_cpuimx27.c	diff1 \|	diff2 \|	blob \| history
board/freescale-mx25-3-stack/3stack.c	diff1 \|	diff2 \|	blob \| history
board/freescale-mx25-3-stack/lowlevel_init.S	diff1 \|	diff2 \|	blob \| history
board/pcm037/pcm037.c	diff1 \|	diff2 \|	blob \| history
board/pcm038/pcm038.c	diff1 \|	diff2 \|	blob \| history
board/pcm043/lowlevel_init.S	diff1 \|	diff2 \|	blob \| history
board/pcm043/pcm043.c	diff1 \|	diff2 \|	blob \| history
board/phycard-i.MX27/pca100.c	diff1 \|	diff2 \|	blob \| history
drivers/nand/nand_imx.c	diff1 \|	diff2 \|	blob \| history
drivers/nand/nand_imx_v2.c	diff1 \|	diff2 \|	blob \| history

This tree is no more updated. Use official barebox repo to get latest mini2440 code.

RSS Atom

arch/arm/mach-imx/include/mach/imx-nand.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/include/mach/imx25-regs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/include/mach/imx35-regs.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/generic.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-s3c24xx/include/mach/s3c24xx-generic.h	diff1 \|	diff2 \|	blob \| history
board/a9m2440/a9m2440.c	diff1 \|	diff2 \|	blob \| history
board/a9m2440/lowlevel_init.S	diff1 \|	diff2 \|	blob \| history
board/eukrea_cpuimx27/eukrea_cpuimx27.c	diff1 \|	diff2 \|	blob \| history
board/freescale-mx25-3-stack/3stack.c	diff1 \|	diff2 \|	blob \| history
board/freescale-mx25-3-stack/lowlevel_init.S	diff1 \|	diff2 \|	blob \| history
board/pcm037/pcm037.c	diff1 \|	diff2 \|	blob \| history
board/pcm038/pcm038.c	diff1 \|	diff2 \|	blob \| history
board/pcm043/lowlevel_init.S	diff1 \|	diff2 \|	blob \| history
board/pcm043/pcm043.c	diff1 \|	diff2 \|	blob \| history
board/phycard-i.MX27/pca100.c	diff1 \|	diff2 \|	blob \| history
drivers/nand/nand_imx.c	diff1 \|	diff2 \|	blob \| history
drivers/nand/nand_imx_v2.c	diff1 \|	diff2 \|	blob \| history