mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / ppc_defs.h
2000-07-19 wdenkInitial revision