Tom Rini 99070db0dc Merge branch 'master' of git://git.denx.de/u-boot-arm ... Conflicts: drivers/serial/serial_lh7a40x.c Signed-off-by: Tom Rini <trini@ti.com>		2012-10-19 18:23:38 -07:00
..
cpu	dm: Move s3c24xx USB driver to a proper place	2012-10-18 06:54:18 +02:00
dts	tegra: fdt: Add NAND controller binding and definitions	2012-09-07 13:54:30 -07:00
imx-common	mx5/6 clocks: Fix SDHC clocks	2012-10-15 11:54:12 -07:00
include/asm	arm: Change global data baudrate to int	2012-10-19 15:25:45 -07:00
lib	arm: fdt: Relocate fdt along with other data	2012-10-19 21:38:27 +02:00
config.mk	arm: work around assembler bug	2012-10-04 14:19:04 +02:00