Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Fri, 2 Jan 2015 12:42:58 +0000 (07:42 -0500)
committerTom Rini <trini@ti.com>
Fri, 2 Jan 2015 12:42:58 +0000 (07:42 -0500)
commitb4a0b4006fe4d6542899abf402c0569b11aa18e2
tree2b2916db1ec8ee619b4435167c5e1a0a4a274e02
parenta74a4a86a53726ba17de8ab863bec1cd60cf545e
parentbe2fde60b0de7723d29035ba952a970d9e1ca94d
Merge branch 'master' of git://git.denx.de/u-boot-spi
arch/arm/cpu/armv7/mx6/clock.c