diff options
author | Stefan Roese <sr@denx.de> | 2008-08-06 12:05:38 (GMT) |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-08-06 12:05:38 (GMT) |
commit | f2302d4430e7f3f48308d6a585320fe96af8afbd (patch) | |
tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 /post/cpu/ppc4xx/ocm.c | |
parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff) | |
download | u-boot-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.xz |
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'post/cpu/ppc4xx/ocm.c')
0 files changed, 0 insertions, 0 deletions