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

author Tom Rini <trini@ti.com>

Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)

committer Tom Rini <trini@ti.com>

Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)
author Tom Rini <trini@ti.com>
Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)
committer Tom Rini <trini@ti.com>
Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)
diff --cc Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge
author	Tom Rini <trini@ti.com>
	Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)
committer	Tom Rini <trini@ti.com>
	Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)
		1	2
Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history