mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / ns87308.h
2002-04-01 wdenkInitial revision