mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / linux_logo.h
2002-09-17 wdenkInitial revision