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

author Tom Rini <[email protected]>

Fri, 26 Sep 2014 13:51:18 +0000 (09:51 -0400)

committer Tom Rini <[email protected]>

Fri, 26 Sep 2014 13:51:18 +0000 (09:51 -0400)
author Tom Rini <[email protected]>
Fri, 26 Sep 2014 13:51:18 +0000 (09:51 -0400)
committer Tom Rini <[email protected]>
Fri, 26 Sep 2014 13:51:18 +0000 (09:51 -0400)
diff --cc board/freescale/t104xrdb/MAINTAINERS
Simple merge
diff --cc include/configs/T104xRDB.h
Simple merge
author	Tom Rini <[email protected]>
	Fri, 26 Sep 2014 13:51:18 +0000 (09:51 -0400)
committer	Tom Rini <[email protected]>
	Fri, 26 Sep 2014 13:51:18 +0000 (09:51 -0400)
		1	2
board/freescale/t104xrdb/MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/T104xRDB.h	patch \|	diff1 \|	diff2 \|	blob \| history