| commit | 8cc3b771a6fc8452c35344ce720df8d579493941 | [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 | bb94affa60fdf915e4b6a5b507501ff2aadc6d57 [diff] | |
| parent | b8ba16c176467e09b756a3836498fb68ce0d6fd5 [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>