Skip to content
Commit 326ea986 authored by Stefano Babic's avatar Stefano Babic
Browse files

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: default avatarStefano Babic <sbabic@denx.de>
parents 4acb4d39 fdce7b63
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment