tree 06342cd9b8cc41b95442a992fb38a1bc8671b05c
parent 978528978cb67adeca7c3dd302fb2efc9590c681
parent c98fedaa1aa79dbae765e784efe7795f4bd33383
author Stefano Babic <sbabic@denx.de> 1379066694 +0200
committer Stefano Babic <sbabic@denx.de> 1379067007 +0200

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

Conflicts:
	MAINTAINERS
	boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>