Stefan Roese f2302d4430 Fix merge problems ...

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

2008-08-06 14:05:38 +02:00

..

atstk1000.c

Fix merge problems

2008-08-06 14:05:38 +02:00

config.mk

Move atstk1000 files into vendor specific directory.

2006-10-24 14:51:36 +02:00

eth.c

board/[A-Za-c]*: Remove obsolete references to CONFIG_COMMANDS

2007-07-09 18:47:45 -05:00

flash.c

Fix merge problems

2008-08-06 14:05:38 +02:00

Makefile

AVR32: Enable networking

2007-04-14 16:14:06 +02:00

u-boot.lds

avr32: Use the same entry point for reset and exception handling

2008-05-27 15:27:30 +02:00