Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Tue, 17 Jan 2017 01:23:14 +0000 (20:23 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 17 Jan 2017 01:23:14 +0000 (20:23 -0500)
1  2 
include/image.h

diff --cc include/image.h
Simple merge