Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 25 Jan 2011 20:13:04 +0000 (21:13 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Jan 2011 20:13:04 +0000 (21:13 +0100)
commit5aebe3b07254d9ec8f7ae23a4525a6c535a7f858
tree398660b7a43c39cee91c51e54678eab46aa7103d
parentd6a5e6d531e357dd8016141f73d370d02886a7eb
parent92966835e96af324fed574815036e481be807d04
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx