mpc83xx: Fix the fatal conflict of merge
[oweals/u-boot.git] / include / s3c24x0.h
2003-06-27 wdenk* Code cleanup: LABEL_2003_06_27_2340
2003-06-19 wdenk* Patches by David Müller, 12 Jun 2003: