summaryrefslogtreecommitdiff
path: root/board/c2mon/u-boot.lds.debug
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-27 12:56:01 +0200
committerWolfgang Denk <wd@denx.de>2008-05-27 12:56:01 +0200
commit1f1554841a4c8e069d331176f0c3059fb2bb8280 (patch)
tree43a492b3f604adedc0ccc3a6432549681375b64f /board/c2mon/u-boot.lds.debug
parent791e1dba8de76ad8e762a7badb869f224a1f8b82 (diff)
parentc918261c6d9f265f88baf70f8a73dfe6f0cb9596 (diff)
downloadu-boot-imx-1f1554841a4c8e069d331176f0c3059fb2bb8280.zip
u-boot-imx-1f1554841a4c8e069d331176f0c3059fb2bb8280.tar.gz
u-boot-imx-1f1554841a4c8e069d331176f0c3059fb2bb8280.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Conflicts: include/configs/socrates.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/c2mon/u-boot.lds.debug')
0 files changed, 0 insertions, 0 deletions