]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Mon, 5 Nov 2012 14:42:00 +0000 (07:42 -0700)
committerTom Rini <trini@ti.com>
Mon, 5 Nov 2012 14:42:00 +0000 (07:42 -0700)
1  2 
MAINTAINERS
Makefile
README
board/ti/am335x/board.c
boards.cfg
drivers/mmc/fsl_esdhc.c
drivers/serial/serial_ns16550.c
include/configs/am335x_evm.h

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc README
Simple merge
Simple merge
diff --cc boards.cfg
Simple merge
Simple merge
Simple merge
Simple merge