| commit | e2b91efc2b1404734845037c2ade56b94fae8479 | [log] [tgz] |
|---|---|---|
| author | Stefan Roese <sr@denx.de> | Sat Dec 29 09:23:11 2007 +0100 |
| committer | Stefan Roese <sr@denx.de> | Sat Dec 29 09:23:11 2007 +0100 |
| tree | 3ee393d421c72a882d27b1de5978a2a9befce062 | |
| parent | a9fa1f34983a154c11f5b0601f9af8e76b49191f [diff] | |
| parent | 268986200cfe509721dafd164191c4d7d791b69e [diff] |
Merge branch 'for-1.3.2-ver2' Conflicts: cpu/ppc4xx/fdt.c include/configs/kilauea.h include/configs/sequoia.h Signed-off-by: Stefan Roese <sr@denx.de>