Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:34:42 +0000 (13:34 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:34:42 +0000 (13:34 -0400)
1  2 
include/configs/ge_bx50v3.h

Simple merge