Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Mon, 24 Nov 2014 17:01:48 +0000 (12:01 -0500)
committerTom Rini <trini@ti.com>
Mon, 24 Nov 2014 17:01:48 +0000 (12:01 -0500)
commit1739564e753bc3a8097f8937a3cbe738bdaaed5d
tree56fe759e62f129dc055b6f6a22f299f6c8b5cdde
parent746667f1e56bf08d03e66a178df3c4f4f6c806e1
parent17b28edb37a33d0c89089faf36e4edd7084f65fa
Merge git://git.denx.de/u-boot-dm

Conflicts:
drivers/serial/serial-uclass.c

Signed-off-by: Tom Rini <trini@ti.com>
README
arch/arm/include/asm/arch-at91/at91sam9260.h
common/Makefile
common/spl/spl.c
drivers/mtd/spi/sandbox.c
drivers/serial/serial-uclass.c
drivers/spi/spi-uclass.c
include/asm-generic/global_data.h
lib/fdtdec.c
scripts/Makefile.spl