git.ipfire.org Git - people/ms/u-boot.git/commit

]> git.ipfire.org Git - people/ms/u-boot.git/commit

projects / people / ms / u-boot.git / commit

author	Stefan Roese <sr@denx.de>
	Wed, 6 Aug 2008 12:05:38 +0000 (14:05 +0200)
committer	Stefan Roese <sr@denx.de>
	Wed, 6 Aug 2008 12:05:38 +0000 (14:05 +0200)
commit	f2302d4430e7f3f48308d6a585320fe96af8afbd
tree	eec529fa883a32b0bd44f65aa46a454dc5c69688	tree \| snapshot
parent	9246f5ecfd353ae297a02ffd5328402acf16c9dd	commit \| diff

Fix merge problems

Signed-off-by: Stefan Roese <sr@denx.de>

132 files changed:

.gitignore		diff \| blob \| blame \| history
CHANGELOG		diff \| blob \| blame \| history
MAKEALL		diff \| blob \| blame \| history
Makefile		diff \| blob \| blame \| history
api/api_storage.c		diff \| blob \| blame \| history
api_examples/demo.c		diff \| blob \| blame \| history
board/adsvix/Makefile	[deleted file]	blob \| blame \| history
board/adsvix/adsvix.c	[deleted file]	blob \| blame \| history
board/adsvix/config.mk	[deleted file]	blob \| blame \| history
board/adsvix/lowlevel_init.S	[deleted file]	blob \| blame \| history
board/adsvix/pcmcia.c	[deleted file]	blob \| blame \| history
board/adsvix/pxavoltage.S	[deleted file]	blob \| blame \| history
board/adsvix/u-boot.lds	[deleted file]	blob \| blame \| history
board/atmel/atngw100/atngw100.c		diff \| blob \| blame \| history
board/atmel/atstk1000/atstk1000.c		diff \| blob \| blame \| history
board/atmel/atstk1000/flash.c		diff \| blob \| blame \| history
board/esd/common/flash.c		diff \| blob \| blame \| history
board/freescale/m5275evb/Makefile		diff \| blob \| blame \| history
board/freescale/mpc8540ads/u-boot.lds		diff \| blob \| blame \| history
board/freescale/mpc8541cds/u-boot.lds		diff \| blob \| blame \| history
board/freescale/mpc8544ds/u-boot.lds		diff \| blob \| blame \| history
board/freescale/mpc8548cds/u-boot.lds		diff \| blob \| blame \| history
board/freescale/mpc8555cds/u-boot.lds		diff \| blob \| blame \| history
board/freescale/mpc8560ads/u-boot.lds		diff \| blob \| blame \| history
board/freescale/mpc8568mds/u-boot.lds		diff \| blob \| blame \| history
board/idmr/mii.c		diff \| blob \| blame \| history
board/ids8247/ids8247.c		diff \| blob \| blame \| history
board/matrix_vision/mvbc_p/mvbc_p.c		diff \| blob \| blame \| history
board/tqc/tqm85xx/tqm85xx.c		diff \| blob \| blame \| history
board/w7o/post2.c		diff \| blob \| blame \| history
common/cmd_bdinfo.c		diff \| blob \| blame \| history
common/cmd_bootm.c		diff \| blob \| blame \| history
common/cmd_flash.c		diff \| blob \| blame \| history
common/cmd_ide.c		diff \| blob \| blame \| history
common/cmd_mfsl.c		diff \| blob \| blame \| history
common/dlmalloc.c		diff \| blob \| blame \| history
common/lcd.c		diff \| blob \| blame \| history
common/main.c		diff \| blob \| blame \| history
cpu/microblaze/interrupts.c		diff \| blob \| blame \| history
cpu/mips/au1x00_serial.c		diff \| blob \| blame \| history
cpu/mpc8260/speed.c		diff \| blob \| blame \| history
cpu/nios2/interrupts.c		diff \| blob \| blame \| history
cpu/nios2/sysid.c		diff \| blob \| blame \| history
cpu/ppc4xx/44x_spd_ddr2.c		diff \| blob \| blame \| history
cpu/pxa/mmc.c		diff \| blob \| blame \| history
doc/README.autoboot		diff \| blob \| blame \| history
doc/README.qemu_mips		diff \| blob \| blame \| history
drivers/i2c/fsl_i2c.c		diff \| blob \| blame \| history
drivers/mmc/atmel_mci.c		diff \| blob \| blame \| history
drivers/mtd/cfi_flash.c		diff \| blob \| blame \| history
drivers/mtd/spi/atmel.c		diff \| blob \| blame \| history
drivers/net/e1000.c		diff \| blob \| blame \| history
drivers/serial/Makefile		diff \| blob \| blame \| history
drivers/serial/atmel_usart.c		diff \| blob \| blame \| history
drivers/serial/mcfuart.c		diff \| blob \| blame \| history
drivers/serial/s3c4510b_uart.c		diff \| blob \| blame \| history
drivers/serial/serial_max3100.c		diff \| blob \| blame \| history
drivers/serial/serial_xuartlite.c		diff \| blob \| blame \| history
drivers/serial/usbtty.c		diff \| blob \| blame \| history
drivers/usb/usbdcore.c		diff \| blob \| blame \| history
drivers/video/atmel_lcdfb.c		diff \| blob \| blame \| history
include/api_public.h		diff \| blob \| blame \| history
include/asm-arm/arch-at91rm9200/AT91RM9200.h		diff \| blob \| blame \| history
include/asm-avr32/io.h		diff \| blob \| blame \| history
include/asm-avr32/sysreg.h		diff \| blob \| blame \| history
include/asm-nios2/types.h		diff \| blob \| blame \| history
include/asm-ppc/fsl_lbc.h		diff \| blob \| blame \| history
include/asm-ppc/global_data.h		diff \| blob \| blame \| history
include/command.h		diff \| blob \| blame \| history
include/configs/ADS860.h		diff \| blob \| blame \| history
include/configs/APC405.h		diff \| blob \| blame \| history
include/configs/Adder.h		diff \| blob \| blame \| history
include/configs/AmigaOneG3SE.h		diff \| blob \| blame \| history
include/configs/CPCI405DT.h		diff \| blob \| blame \| history
include/configs/DU440.h		diff \| blob \| blame \| history
include/configs/FADS860T.h		diff \| blob \| blame \| history
include/configs/GTH.h		diff \| blob \| blame \| history
include/configs/KUP4K.h		diff \| blob \| blame \| history
include/configs/KUP4X.h		diff \| blob \| blame \| history
include/configs/MPC86xADS.h		diff \| blob \| blame \| history
include/configs/MPC885ADS.h		diff \| blob \| blame \| history
include/configs/MVBC_P.h		diff \| blob \| blame \| history
include/configs/MVBLUE.h		diff \| blob \| blame \| history
include/configs/NC650.h		diff \| blob \| blame \| history
include/configs/PLU405.h		diff \| blob \| blame \| history
include/configs/PMC440.h		diff \| blob \| blame \| history
include/configs/RPXlite_DW.h		diff \| blob \| blame \| history
include/configs/SXNI855T.h		diff \| blob \| blame \| history
include/configs/adsvix.h	[deleted file]	blob \| blame \| history
include/configs/apollon.h		diff \| blob \| blame \| history
include/configs/at91rm9200dk.h		diff \| blob \| blame \| history
include/configs/atngw100.h		diff \| blob \| blame \| history
include/configs/atstk1002.h		diff \| blob \| blame \| history
include/configs/atstk1003.h		diff \| blob \| blame \| history
include/configs/atstk1004.h		diff \| blob \| blame \| history
include/configs/atstk1006.h		diff \| blob \| blame \| history
include/configs/csb637.h		diff \| blob \| blame \| history
include/configs/gth2.h		diff \| blob \| blame \| history
include/configs/gw8260.h		diff \| blob \| blame \| history
include/configs/hymod.h		diff \| blob \| blame \| history
include/configs/linkstation.h		diff \| blob \| blame \| history
include/configs/lwmon.h		diff \| blob \| blame \| history
include/configs/lwmon5.h		diff \| blob \| blame \| history
include/configs/m501sk.h		diff \| blob \| blame \| history
include/configs/motionpro.h		diff \| blob \| blame \| history
include/configs/mp2usb.h		diff \| blob \| blame \| history
include/configs/netstar.h		diff \| blob \| blame \| history
include/configs/ppmc8260.h		diff \| blob \| blame \| history
include/configs/quantum.h		diff \| blob \| blame \| history
include/configs/rmu.h		diff \| blob \| blame \| history
include/configs/sacsng.h		diff \| blob \| blame \| history
include/configs/sbc8260.h		diff \| blob \| blame \| history
include/configs/sc3.h		diff \| blob \| blame \| history
include/configs/trab.h		diff \| blob \| blame \| history
include/configs/utx8245.h		diff \| blob \| blame \| history
include/ppc4xx.h		diff \| blob \| blame \| history
lib_arm/board.c		diff \| blob \| blame \| history
lib_arm/bootm.c		diff \| blob \| blame \| history
lib_m68k/time.c		diff \| blob \| blame \| history
lib_sparc/board.c		diff \| blob \| blame \| history
nand_spl/board/amcc/kilauea/Makefile		diff \| blob \| blame \| history
onenand_ipl/board/apollon/Makefile		diff \| blob \| blame \| history
post/cpu/ppc4xx/spr.c		diff \| blob \| blame \| history
post/lib_ppc/b.c		diff \| blob \| blame \| history
post/lib_ppc/cmp.c		diff \| blob \| blame \| history
post/lib_ppc/cmpi.c		diff \| blob \| blame \| history
post/lib_ppc/complex.c		diff \| blob \| blame \| history
post/lib_ppc/cr.c		diff \| blob \| blame \| history
post/lib_ppc/load.c		diff \| blob \| blame \| history
post/lib_ppc/multi.c		diff \| blob \| blame \| history
post/lib_ppc/store.c		diff \| blob \| blame \| history
post/lib_ppc/string.c		diff \| blob \| blame \| history

"Das U-Boot" Source Tree

RSS Atom