tree 337677f8f62440561b93dca1053f6105c2c880c2
parent 98ab14e858bf60306d0aa3f0df5a7a5f88264aff
parent afb0b1315c048ce2b1f35f0183b8b118ad0c14e1
author Wolfgang Denk <wd@denx.de> 1246992852 +0200
committer Wolfgang Denk <wd@denx.de> 1246992852 +0200

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