tree e9624193509e0608d4f5b4192cd496bfb0f9a641
parent 91081e01b10d64e99dc485e477e6ae3b1171e8ce
parent d49f8e04dba056803a80388798b735814b893bbf
author Wolfgang Denk <wd@denx.de> 1305494410 +0200
committer Wolfgang Denk <wd@denx.de> 1305494410 +0200

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