Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Mon, 30 Nov 2015 12:10:18 +0000 (07:10 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 30 Nov 2015 12:10:18 +0000 (07:10 -0500)
commitc1924d85af4a07dc70aef1ef95c48b54a136733f
tree78b34b2dd76db0a975cd3008dca3cd10362389da
parentf1df81c4008c8e0edbc1a2738cf2490b2f7be661
parent3dbdb4dd4f8e5847b8f7d6dbd849e0b9a0907a5b
Merge branch 'master' of git://git.denx.de/u-boot-video