Conflicts: include/asm-ppc/fsl_lbc.h Signed-off-by: Wolfgang Denk <wd@denx.de> |
||
---|---|---|
.. | ||
Makefile | ||
config.mk | ||
law.c | ||
mpc8610hpcd.c | ||
mpc8610hpcd_diu.c | ||
u-boot.lds |
Conflicts: include/asm-ppc/fsl_lbc.h Signed-off-by: Wolfgang Denk <wd@denx.de> |
||
---|---|---|
.. | ||
Makefile | ||
config.mk | ||
law.c | ||
mpc8610hpcd.c | ||
mpc8610hpcd_diu.c | ||
u-boot.lds |