Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Fri, 4 Dec 2015 13:21:28 +0000 (08:21 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 4 Dec 2015 13:21:28 +0000 (08:21 -0500)
1  2 
drivers/video/ipu_disp.c

Simple merge