| commit | ab00e7a23e088505b22cba7b84145806129b83bf | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Sep 09 02:24:51 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Sep 09 02:24:51 2008 +0200 |
| tree | 5acdfb4c2b87058d132dc8fe9fb81d394cb034bd | |
| parent | 4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c [diff] | |
| parent | 5ff889349d2ace13f10c9335e09365fcec8247cc [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx Conflicts: Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>