| commit | feaa43f3a8f465cbf01ffa1b23b6b52431819a52 | [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 | 8697e6a19b10f514511b6a9c86de88bd108c4f8d [diff] | |
| parent | e174ac34adf5d5653df12bc3cf19c52063a71269 [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>