Merge branch 'master' of git://git.denx.de/u-boot-arm

author Tom Rini <trini@ti.com>

Tue, 8 Oct 2013 13:51:48 +0000 (09:51 -0400)

committer Tom Rini <trini@ti.com>

Tue, 8 Oct 2013 13:51:48 +0000 (09:51 -0400)
author Tom Rini <trini@ti.com>
Tue, 8 Oct 2013 13:51:48 +0000 (09:51 -0400)
committer Tom Rini <trini@ti.com>
Tue, 8 Oct 2013 13:51:48 +0000 (09:51 -0400)
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc include/configs/am335x_evm.h
Simple merge
author	Tom Rini <trini@ti.com>
	Tue, 8 Oct 2013 13:51:48 +0000 (09:51 -0400)
committer	Tom Rini <trini@ti.com>
	Tue, 8 Oct 2013 13:51:48 +0000 (09:51 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/am335x_evm.h	patch \|	diff1 \|	diff2 \|	blob \| history