Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@ti.com>
Wed, 5 Nov 2014 17:48:09 +0000 (12:48 -0500)
committerTom Rini <trini@ti.com>
Wed, 5 Nov 2014 17:48:09 +0000 (12:48 -0500)
commit625509ab0edbb7d943ad9028de3c21ca48aa58be
tree2ea6bda524b3ad7e964f4357428de2890ad81cf4
parentd5325eff10922acb11c39efece6d5f24de5b1998
parent0b23780ff02bdbec46fac1fe4151e2ebf1eae881
Merge branch 'master' of git://denx.de/git/u-boot-imx
arch/arm/Kconfig
arch/arm/cpu/armv7/mx6/soc.c
board/compulab/cm_fx6/cm_fx6.c
include/configs/imx6_spl.h
include/configs/tqma6.h