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

author Stefano Babic <sbabic@denx.de>

Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)

committer Stefano Babic <sbabic@denx.de>

Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)
author Stefano Babic <sbabic@denx.de>
Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)
committer Stefano Babic <sbabic@denx.de>
Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
author	Stefano Babic <sbabic@denx.de>
	Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)
committer	Stefano Babic <sbabic@denx.de>
	Fri, 8 Aug 2014 08:18:40 +0000 (10:18 +0200)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history