summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-14 15:12:01 +0200
committerStefan Roese <sr@denx.de>2007-08-14 15:12:01 +0200
commit4ce846ec59f36b85d6644a769690ad3feb667575 (patch)
tree6dfedf3eeebbab0eefde4d5d17e5fffec10c9536 /Makefile
parent429d9571f60631ae8a2fe12b11be4c75b0c2b37c (diff)
downloadu-boot-imx-4ce846ec59f36b85d6644a769690ad3feb667575.zip
u-boot-imx-4ce846ec59f36b85d6644a769690ad3feb667575.tar.gz
u-boot-imx-4ce846ec59f36b85d6644a769690ad3feb667575.tar.bz2
POST: Fix merge problem
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions