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)
commita85670e40da1ef4f299effb73c36e48d39d50106
tree19886e80adb2c9e201387b74a042953e0070bb10
parentf5bcfe151e61558572b9f9036c67d51bd831a436
parenta80a999c9b5c128cad2f67b4b32036bd4d667904
Merge branch 'master' of git://denx.de/git/u-boot-imx
drivers/video/ipu_disp.c