tree 6247dce2d1e72aa17fd2d7a138af66158d02f319
parent 39d90431ab7451e0a0b808677c776baa3e9adf69
parent 909f2586075e84cd79470ab9b731aebe061cabf6
author Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 1196265397 +0900
committer Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 1196265397 +0900

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

Conflicts:

	drivers/Makefile