summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-07 23:59:10 +0200
committerWolfgang Denk <wd@denx.de>2008-04-07 23:59:10 +0200
commite59af4b611408adcdfb5e19bc5194a7d1f8b4dc3 (patch)
treee700a523f54c5ed18bf15f832158f90a31517c85 /Makefile
parent23c5189e6c969255f8c91b30fdf1cf81b698329d (diff)
parent70431e8a7393b6b793f77957f95b999fc9a269b8 (diff)
downloadu-boot-imx-e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3.zip
u-boot-imx-e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3.tar.gz
u-boot-imx-e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Conflicts: lib_ppc/board.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions