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)
1  2 
arch/arm/cpu/armv7/mx6/clock.c

Simple merge