| commit | 7b899b52f433c5ea4af46c07e2b5bced08857fec | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Sep 28 23:30:47 2010 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Sep 28 23:30:47 2010 +0200 |
| tree | 00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0 | |
| parent | b7f9ee33c83e7f4c4fa9b9ace872b1408b858d34 [diff] | |
| parent | 29a58661a979de57fb8f1c527370fbbbe3313c1b [diff] |
Merge branch 'next' of /home/wd/git/u-boot/next Conflicts: include/ppc4xx.h Signed-off-by: Wolfgang Denk <wd@denx.de>