diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 20:58:16 +0200 |
| commit | 083d506937002f2795c80fe0c3ae194ad2c3d085 (patch) | |
| tree | 3f7685842824cbd42c290d575d39a7dd3d01bccd /arch/arm/include/asm/u-boot-arm.h | |
| parent | b485556be51d1edae0a2c0065e2f572ca42a1eee (diff) | |
| parent | b952c24adeb7bfdb09f60d5d1f49fa86a2686c1c (diff) | |
| download | u-boot-imx-083d506937002f2795c80fe0c3ae194ad2c3d085.zip u-boot-imx-083d506937002f2795c80fe0c3ae194ad2c3d085.tar.gz u-boot-imx-083d506937002f2795c80fe0c3ae194ad2c3d085.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Conflicts:
board/logicpd/imx31_litekit/config.mk
boards.cfg
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm/include/asm/u-boot-arm.h')
0 files changed, 0 insertions, 0 deletions