| commit | a7de951a8829aa7ddc8b3cc29d092588338a8582 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Sun Jul 06 01:15:17 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Sun Jul 06 01:15:17 2008 +0200 |
| tree | 005ba8a000e7bdcab42c1df6339bf7e51dcda2ca | |
| parent | 240d07532074ed5dbff7dc7995cc823e9b93c491 [diff] | |
| parent | 7460f109e806917937e4da90a70b3efabaf413be [diff] |
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master Conflicts: board/amirix/ap1000/serial.c board/exbitgen/exbitgen.c board/exbitgen/flash.c board/ml2/serial.c board/xilinx/ml300/serial.c Signed-off-by: Wolfgang Denk <wd@denx.de>