Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Tue, 26 Jan 2016 14:48:07 +0000 (09:48 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 26 Jan 2016 14:48:07 +0000 (09:48 -0500)
commitb72ae192e39f933100b0eb034768cb4daeebf67a
tree34d7b00636a472040f81b3ee1ae7f1a0a09ec1b7
parentd6ea6d88769e85f6873a94065a1ba167c9b592da
parent7588c312528eea9e24ef5c1b9a29a256ac5024d4
Merge branch 'master' of git://git.denx.de/u-boot-video