tree 05bc55b8a4a0451e6500f1f52651d81c0f48f012
parent 69df3c4da0c93017cceb25a366e794570bd0ed98
parent 66dcad3a9a53e0766d90e0084123bd8529522fb0
author Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 1190478583 +0900
committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 1190478583 +0900

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

Conflicts:

	CREDITS