Albert ARIBAUD 96764df1b4 Merge samsung, imx, tegra into u-boot-arm/master ... This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as well as a few manual merge fixes.		2012-12-22 11:59:14 +01:00
..
cpu	Merge samsung, imx, tegra into u-boot-arm/master	2012-12-22 11:59:14 +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 samsung, imx, tegra into u-boot-arm/master	2012-12-22 11:59:14 +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