| commit | 2e6e1772c0e34871769be4aef79748fe3e47d953 | [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 | 1e4e5ef0469050f014aee1204dae8a9ab6053e49 [diff] | |
| parent | 3df61957938586c512c17e72d83551d190400981 [diff] |
Merge branch 'next' of /home/wd/git/u-boot/next Conflicts: include/ppc4xx.h Signed-off-by: Wolfgang Denk <wd@denx.de>