Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Sat, 18 Jun 2016 08:24:54 +0000 (10:24 +0200)
committerStefano Babic <sbabic@denx.de>
Sat, 18 Jun 2016 08:25:13 +0000 (10:25 +0200)
commitdc557e9a1fe00ca9d884bd88feef5bebf23fede4
treeec09fdf8f7c4c44e30f4b38b7459a2cbbb71d094
parentd2ba7a6adcef6e6f8c4418c7b0caf9d7ab98a6d4
parent6b3943f1b04be60f147ee540fbd72c4c7ea89f80
Merge branch 'master' of git://git.denx.de/u-boot

Signed-off-by: Stefano Babic <sbabic@denx.de>
board/gateworks/gw_ventana/gw_ventana.c
drivers/mtd/nand/mxs_nand.c
include/configs/ge_bx50v3.h
include/configs/ts4800.h