tree 9a5d44eb1fcca45dfd30557318f786b66392a8f3
parent 2931fa4db349c97f882ffda42e901208654b5ca9
parent 4611d5bab26f93471b84f6f33967cef69b3f723a
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1388994598 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1388994598 +0100

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
	include/micrel.h

The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.