tree aed80b37950e5b81f31de9ce60ed324f68423e3c
parent 62e8a97485dde923b13e9ebd4b850e5da7104a04
parent 0d7a085e0aa9be452c4f91daf15709977a641b36
author Wolfgang Denk <wd@pollux.denx.de> 1170164301 +0100
committer Wolfgang Denk <wd@denx.de> 1170164301 +0100

Merge with /home/sr/git/u-boot/denx-merge-sr