Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Fri, 14 Aug 2015 17:43:23 +0000 (13:43 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 14 Aug 2015 20:27:16 +0000 (16:27 -0400)
1  2 
drivers/video/Kconfig

Simple merge