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)
1  2 
drivers/video/Makefile

Simple merge