diff options
| author | Andy Fleming <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
| commit | 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch) | |
| tree | 4bc9e1362c3090bb6d2df71109228ca61b8d00ce /MAKEALL | |
| parent | 5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff) | |
| parent | 5dc210dec5bace98a50b6ba905347890091a9bb0 (diff) | |
| download | u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.zip u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.gz u-boot-imx-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.bz2 | |
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
Diffstat (limited to 'MAKEALL')
| -rwxr-xr-x | MAKEALL | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -144,10 +144,10 @@ LIST_83xx=" \ LIST_85xx=" \ MPC8540ADS MPC8540EVAL MPC8541CDS MPC8544DS \ - MPC8548CDS MPC8555CDS MPC8560ADS PM854 \ - PM856 sbc8540 sbc8560 stxgp3 \ - stxssa TQM8540 TQM8541 TQM8555 \ - TQM8560 \ + MPC8548CDS MPC8555CDS MPC8560ADS MPC8568MDS \ + PM854 PM856 sbc8540 sbc8560 \ + stxgp3 stxssa TQM8540 TQM8541 \ + TQM8555 TQM8560 \ " ######################################################################### |