| commit | fcc6238887931a9fca15a5f6fc56f591660c9cde | [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 | d45f81a1c5f92b1e365a19144fc331a26290c971 [diff] | |
| parent | 9c31901ff749957143ea79e79099091f4eae0cb6 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx Conflicts: Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>