| commit | 3cd07dce6576f2a06fed1303722b3347ba2f232c | [log] [tgz] |
|---|---|---|
| author | Stefano Babic <sbabic@denx.de> | Wed Jul 31 11:30:38 2013 +0200 |
| committer | Stefano Babic <sbabic@denx.de> | Wed Jul 31 11:30:38 2013 +0200 |
| tree | 15724288b8b6da3a98d934db8330bb964cdfdf36 | |
| parent | fe6296fcfca034e3a1704e520dd319c20dcf7b75 [diff] | |
| parent | 05d5f99c3c7972c0c582823be0041e3dca3c3768 [diff] |
Merge git://git.denx.de/u-boot-arm Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <sbabic@denx.de>