Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Sat, 4 Jun 2016 12:49:08 +0000 (08:49 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 4 Jun 2016 12:49:08 +0000 (08:49 -0400)
commitc41c649c2fdec7bf6ef84173597cc3feabdb7828
treea6b7e3d25eb9d62e5b9989040aa39ddd1c00a83a
parentf15715afea3e7b576fad1f6877a073b65576a335
parentff78aa2ba19cda755b01818fb3caf2aca9236865
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
arch/arm/Kconfig
arch/arm/dts/Makefile