]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36ae5cd 9ea09e2)
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 patch | diff1 | diff2 | blob | history
include/configs/am43xx_evm.h patch | diff1 | diff2 | blob | history

diff --cc include/configs/am43xx_evm.h
Simple merge
Cloned from git://git.denx.de/u-boot.git