]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)
committerTom Rini <trini@ti.com>
Fri, 21 Feb 2014 13:00:22 +0000 (08:00 -0500)
1  2 
arch/arm/include/asm/arch-mx6/imx-regs.h
include/configs/am43xx_evm.h

Simple merge