| commit | 326ea986ac150acdc7656d57fca647db80b50158 | [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 | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 [diff] | |
| parent | fdce7b633a1de24456226b18527cc7900c34282a [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>