| commit | 2f6e76d23ced547a7f752abd4a753e7787559775 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Sun Mar 02 21:29:18 2008 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Sun Mar 02 21:29:18 2008 +0100 |
| tree | c877ec70a6bf29e61ae4a58b477ac2d0eeef360e | |
| parent | 44ceec253ea941b301abf4b079d52324def69d92 [diff] | |
| parent | 14e099e698d41e8179d05c2b2dbcf704a236f748 [diff] |
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>