| commit | 083d506937002f2795c80fe0c3ae194ad2c3d085 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Tue Oct 19 20:58:16 2010 +0200 |
| committer | Wolfgang Denk <wd@denx.de> | Tue Oct 19 20:58:16 2010 +0200 |
| tree | 3f7685842824cbd42c290d575d39a7dd3d01bccd | |
| parent | b485556be51d1edae0a2c0065e2f572ca42a1eee [diff] | |
| parent | b952c24adeb7bfdb09f60d5d1f49fa86a2686c1c [diff] |
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>