Albert ARIBAUD 79f3877794 Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' ... This required manual merging drivers/mtd/nand/Makefile and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS		2013-01-08 13:15:45 +01:00
..
cpu	Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'	2013-01-08 13:15:45 +01:00
dts	tegra: fdt: Add LCD definitions for Tegra	2012-11-19 08:15:36 -07:00
imx-common	imx-common: cpu: add imx_ddr_size	2012-11-10 08:15:40 +01:00
include/asm	Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'	2013-01-08 13:15:45 +01:00
lib	Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged	2012-12-19 13:02:36 -08:00
config.mk	arm: work around assembler bug	2012-10-04 14:19:04 +02:00