summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2007-05-07 16:43:56 +0200
committerMarkus Klotzbuecher <mk@pollux.denx.de>2007-05-07 16:43:56 +0200
commit3a619dd7bed03e8b4d22a3911f90fd12af5376c2 (patch)
tree1152a4edd19f33d39a1b7158e24481f0552f95fb /common
parent6ede0c8b69ad1e6b16463ec75a6dccca152c4b17 (diff)
downloadu-boot-imx-3a619dd7bed03e8b4d22a3911f90fd12af5376c2.zip
u-boot-imx-3a619dd7bed03e8b4d22a3911f90fd12af5376c2.tar.gz
u-boot-imx-3a619dd7bed03e8b4d22a3911f90fd12af5376c2.tar.bz2
Fix an ancient CHANGELOG conflict
Diffstat (limited to 'common')
0 files changed, 0 insertions, 0 deletions