Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <trini@konsulko.com>
Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 27 May 2016 19:48:53 +0000 (15:48 -0400)
commit378f9134eba4665ea94a63653393d25418665fda
treee273a03c52e8261c0f6c401914d44a9eff442684
parent9b77b19178446393fce2e74554815c17454f8da8
parent2ed6dc83380ea2f49ec09556c14c6eddd3f5c27a
Merge git://git.denx.de/u-boot-rockchip
drivers/net/designware.c
drivers/net/designware.h