summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-03-02 21:29:18 +0100
committerWolfgang Denk <wd@denx.de>2008-03-02 21:29:18 +0100
commit2f6e76d23ced547a7f752abd4a753e7787559775 (patch)
treec877ec70a6bf29e61ae4a58b477ac2d0eeef360e
parent44ceec253ea941b301abf4b079d52324def69d92 (diff)
parent14e099e698d41e8179d05c2b2dbcf704a236f748 (diff)
downloadu-boot-imx-2f6e76d23ced547a7f752abd4a753e7787559775.zip
u-boot-imx-2f6e76d23ced547a7f752abd4a753e7787559775.tar.gz
u-boot-imx-2f6e76d23ced547a7f752abd4a753e7787559775.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
Conflicts: include/asm-arm/arch-imx/imx-regs.h Signed-off-by: Wolfgang Denk <wd@denx.de>
0 files changed, 0 insertions, 0 deletions