Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq master
authorTom Rini <trini@ti.com>
Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)
committerTom Rini <trini@ti.com>
Wed, 25 Feb 2015 23:14:18 +0000 (18:14 -0500)
1  2 
Kconfig
drivers/net/Makefile

diff --cc Kconfig
Simple merge
Simple merge