]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://git.denx.de/u-boot-net
authorTom Rini <trini@konsulko.com>
Tue, 24 May 2016 15:59:02 +0000 (11:59 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 24 May 2016 15:59:02 +0000 (11:59 -0400)
commit2ee490a0245b65826a8ce8e42e34c9bf805d3656
treec53f7d3513bd284b181d3aaa61534a0d62751884
parentec8fb48ce98987065493b27422200897cf0909f8
parent0a71cd77290ca317ecf6f15984a91abbee741e09
Merge branch 'master' of git://git.denx.de/u-boot-net

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/zynq_gem.c
drivers/net/phy/phy.c
drivers/net/zynq_gem.c