git.sur5r.net Git - u-boot/commit

]> git.sur5r.net Git - u-boot/commit

projects / u-boot / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 746667f 17b28ed)

author	Tom Rini <trini@ti.com>
	Mon, 24 Nov 2014 17:01:48 +0000 (12:01 -0500)
committer	Tom Rini <trini@ti.com>
	Mon, 24 Nov 2014 17:01:48 +0000 (12:01 -0500)
commit	1739564e753bc3a8097f8937a3cbe738bdaaed5d
tree	56fe759e62f129dc055b6f6a22f299f6c8b5cdde	tree \| snapshot
parent	746667f1e56bf08d03e66a178df3c4f4f6c806e1	commit \| diff
parent	17b28edb37a33d0c89089faf36e4edd7084f65fa	commit \| diff

Merge git://git.denx.de/u-boot-dm

Conflicts:
drivers/serial/serial-uclass.c

Signed-off-by: Tom Rini <trini@ti.com>

README	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-at91/at91sam9260.h	diff1 \|	diff2 \|	blob \| history
common/Makefile	diff1 \|	diff2 \|	blob \| history
common/spl/spl.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/spi/sandbox.c	diff1 \|	diff2 \|	blob \| history
drivers/serial/serial-uclass.c	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-uclass.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/global_data.h	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.spl	diff1 \|	diff2 \|	blob \| history

Cloned from git://git.denx.de/u-boot.git