Merge branch 'master' of git://git.denx.de/u-boot-imx
authorTom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
committerTom Rini <trini@ti.com>
Mon, 27 Oct 2014 13:08:42 +0000 (09:08 -0400)
commit0ce4af99c07acebf4fce9a91f1099d2460629293
treed87d969bfc91662e7a90b3c4fcce35acf4a3cdaf
parent5aa7bece1045c28806ce919099616ebe8fa63325
parent3f97af5302ee15530411232b464d255eb2ff2ffb
Merge branch 'master' of git://git.denx.de/u-boot-imx
arch/arm/cpu/armv7/mx6/soc.c
arch/arm/lib/bootm.c