Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 16:51:34 +0000 (12:51 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 12 Jun 2016 16:51:34 +0000 (12:51 -0400)
commit3fc304b8d77ce6646d38ae506e9fae74b9975631
treebf632784c6fe22394e60477377b02671ba3ad131
parentb57129dbdade13ee152daf15a4221d8582f48387
parentd2ba7a6adcef6e6f8c4418c7b0caf9d7ab98a6d4
Merge branch 'master' of git://denx.de/git/u-boot-imx
board/gateworks/gw_ventana/gw_ventana.c
drivers/mtd/nand/mxs_nand.c
include/configs/ge_bx50v3.h
include/configs/ts4800.h