| commit | 2300d5a2b6469274d1b74e634b3cbfbe68ee610d | [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 | 8a4bafd4c7a02daf49ad467a0e54aca15f47991c [diff] | |
| parent | 7ff3d6f3dbcf260ce55fe17a7af91f71fa00a5b7 [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>