Tom Rini 41341221d1 Merge branch 'master' of git://git.denx.de/u-boot-arm ... Small conflict over DRA7XX updates and adding SRAM_SCRATCH_SPACE_ADDR Conflicts: arch/arm/include/asm/arch-omap5/omap.h Signed-off-by: Tom Rini <trini@ti.com>		2013-06-13 15:16:15 -04:00
..
board.c	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-06-13 15:16:15 -04:00
board.h	am33xx: Enable UART{1,2,3,4,5} pin-mux	2012-10-25 14:54:50 -07:00
Makefile	am33xx: move ti i2c baseboard header handling to board/ti/am335x/	2012-10-25 11:31:36 -07:00
mux.c	am335x_evm: add nand pinmux definition	2012-12-10 08:54:01 -07:00