Fix merge problems
authorStefan Roese <sr@denx.de>
Wed, 6 Aug 2008 12:05:38 +0000 (14:05 +0200)
committerStefan Roese <sr@denx.de>
Wed, 6 Aug 2008 12:05:38 +0000 (14:05 +0200)
commitf2302d4430e7f3f48308d6a585320fe96af8afbd
treeeec529fa883a32b0bd44f65aa46a454dc5c69688
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd
Fix merge problems

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