diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-05 23:15:17 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-05 23:15:17 (GMT) |
| commit | d86a0a6f7fe433787edf06aecba9fd6abfecab48 (patch) | |
| tree | 005ba8a000e7bdcab42c1df6339bf7e51dcda2ca /cpu/mpc824x | |
| parent | a524e112b424c6843800ea2f19d3a8cf01d0aa94 (diff) | |
| parent | f492dd636fbbae529e17533995bc6e5813c007f6 (diff) | |
| download | u-boot-fsl-qoriq-d86a0a6f7fe433787edf06aecba9fd6abfecab48.tar.xz | |
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>
Diffstat (limited to 'cpu/mpc824x')
0 files changed, 0 insertions, 0 deletions