diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 21:33:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 21:33:16 +0200 |
| commit | 5ea67393b8b554b8165c38912d753a8df043020d (patch) | |
| tree | 080077826cffcfebbaa0a950c663e7d165cf6b7d /nand_spl/nand_boot.c | |
| parent | 2395db48869e759c4422efa3d3c25161601aa17b (diff) | |
| parent | ba04f7010958e88a8910f2a123fee53fdc72e013 (diff) | |
| download | u-boot-imx-5ea67393b8b554b8165c38912d753a8df043020d.zip u-boot-imx-5ea67393b8b554b8165c38912d753a8df043020d.tar.gz u-boot-imx-5ea67393b8b554b8165c38912d753a8df043020d.tar.bz2 | |
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>
Diffstat (limited to 'nand_spl/nand_boot.c')
0 files changed, 0 insertions, 0 deletions