From: Tom Rini Date: Tue, 5 Feb 2019 13:32:52 +0000 (-0500) Subject: Merge tag 'for-master-20190205' of git://git.denx.de/u-boot-rockchip X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c0bf3968d7fffa135305ba58644773d32f51090a;p=u-boot.git Merge tag 'for-master-20190205' of git://git.denx.de/u-boot-rockchip Removes artifacts (.rej-files) from the last merge. --- c0bf3968d7fffa135305ba58644773d32f51090a