summaryrefslogtreecommitdiff
path: root/board/samsung
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-03 22:55:55 +0200
committerWolfgang Denk <wd@denx.de>2008-09-03 22:55:55 +0200
commit4615fc22e539a2f7dae971701c05f09e21c1ca25 (patch)
tree21521ea036a6339414051ba8fc37106fbcdcc1d3 /board/samsung
parent16116ddd0d0158f4e91c91dc979b845b6e98a99d (diff)
parent7deb3b3ecd0e81ef09bb68aa0ec2346f4ae0a405 (diff)
downloadu-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.zip
u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.gz
u-boot-imx-4615fc22e539a2f7dae971701c05f09e21c1ca25.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts: board/esd/dasa_sim/dasa_sim.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/samsung')
0 files changed, 0 insertions, 0 deletions