Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Wed, 30 Nov 2016 14:57:52 +0000 (09:57 -0500)
committerTom Rini <trini@konsulko.com>
Wed, 30 Nov 2016 14:57:52 +0000 (09:57 -0500)
1  2 
arch/arm/Kconfig

Simple merge