From: Tom Rini <trini@konsulko.com>
Date: Tue, 23 Aug 2016 11:20:36 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-net
X-Git-Tag: KARO-TXSD-2017-03-15~266
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=46fe9eb08812cc27a0d5cd97d97373c14d578fe9;hp=-c;p=karo-tx-uboot.git

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

46fe9eb08812cc27a0d5cd97d97373c14d578fe9