Merge branch 'master' of git://git.denx.de/u-boot-video
authorTom Rini <trini@konsulko.com>
Sun, 30 Aug 2015 23:48:39 +0000 (19:48 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 30 Aug 2015 23:48:39 +0000 (19:48 -0400)
commit7c0e5d865ff0b86dfce492b656238919c659d756
tree673b7954e13e1964240cff790f49c0044c418b5e
parentf875bbb49111c308b90b9ca74d1b79f69498b278
parentc385ac283023a4fdd304674a8163ac271a1fb758
Merge branch 'master' of git://git.denx.de/u-boot-video