Merge branch 'merge' of git://www.denx.de/git/u-boot-microblaze
authorWolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 20:57:43 +0000 (22:57 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 20:57:43 +0000 (22:57 +0200)
commit8f05a661e952f0edfefb985a5be4ad3c721a897e
tree7f9eac58a81fe09f9d4922683407162577a4d994
parent86cc433e1b06aae6dcda399219009f2a2497a385
parent853643d8cf2ca80cb2e25c53ad5dc580abafe166
Merge branch 'merge' of git://denx.de/git/u-boot-microblaze