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

author Tom Rini <trini@konsulko.com>

Sat, 4 Jun 2016 16:12:26 +0000 (12:12 -0400)

committer Tom Rini <trini@konsulko.com>

Sat, 4 Jun 2016 16:12:26 +0000 (12:12 -0400)
author Tom Rini <trini@konsulko.com>
Sat, 4 Jun 2016 16:12:26 +0000 (12:12 -0400)
committer Tom Rini <trini@konsulko.com>
Sat, 4 Jun 2016 16:12:26 +0000 (12:12 -0400)
diff --cc board/freescale/t102xqds/ddr.c
Simple merge
diff --cc board/freescale/t102xrdb/ddr.c
Simple merge
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/gpio/Makefile
Simple merge
author	Tom Rini <trini@konsulko.com>
	Sat, 4 Jun 2016 16:12:26 +0000 (12:12 -0400)
committer	Tom Rini <trini@konsulko.com>
	Sat, 4 Jun 2016 16:12:26 +0000 (12:12 -0400)
		1	2
board/freescale/t102xqds/ddr.c	patch \|	diff1 \|	diff2 \|	blob \| history
board/freescale/t102xrdb/ddr.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history