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)
commit1606b34aa50804227806971dbb6b82ea0bf81f55
tree5c7570722616c6509f6f9126521d0c69c2614f8d
parent47d8ae4069b47ce966c0c5e0d8dd041e69ee1f86
parent94e3c8c4fd7bfe395fa467973cd647551d6d98c7
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Kconfig
drivers/net/Makefile