Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 12 Sep 2014 15:27:46 +0000 (11:27 -0400)
committerTom Rini <trini@ti.com>
Fri, 12 Sep 2014 15:27:46 +0000 (11:27 -0400)
commit114cc4290b2f24bb314edf2edd5d8738a0778c4b
treee3ca947656fea69adb810bab0ee5a32c0d413919
parentb7a809957bcd72c2efa49ce733774b1e28878585
parenta7f99bf139b3aaa0d5494693fd0395084355e41a
Merge branch 'master' of git://git.denx.de/u-boot-arm
drivers/video/Makefile