Merge branch 'master' of git://www.denx.de/git/u-boot-imx

author Tom Rini <[email protected]>

Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)

committer Tom Rini <[email protected]>

Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)
author Tom Rini <[email protected]>
Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)
committer Tom Rini <[email protected]>
Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)
diff --cc common/board_f.c
Simple merge
diff --cc include/configs/mx35pdk.h
Simple merge
author	Tom Rini <[email protected]>
	Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)
committer	Tom Rini <[email protected]>
	Wed, 18 Mar 2015 11:07:43 +0000 (07:07 -0400)
		1	2
common/board_f.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/mx35pdk.h	patch \|	diff1 \|	diff2 \|	blob \| history