Stefano Babic 326ea986ac 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>		2013-07-31 11:30:38 +02:00
..
nitrogen6x	Merge git://git.denx.de/u-boot-arm	2013-07-31 11:30:38 +02:00