| commit | 5ea67393b8b554b8165c38912d753a8df043020d | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Wed Jun 11 21:33:16 2008 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Wed Jun 11 21:33:16 2008 +0200 |
| tree | 080077826cffcfebbaa0a950c663e7d165cf6b7d | |
| parent | 2395db48869e759c4422efa3d3c25161601aa17b [diff] | |
| parent | ba04f7010958e88a8910f2a123fee53fdc72e013 [diff] |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx Conflicts: include/asm-ppc/fsl_lbc.h Signed-off-by: Wolfgang Denk <wd@denx.de>