Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:57:58 +0000 (22:57 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:57:58 +0000 (22:57 +0200)
commit8115c6f9eb6b030cc52b61acdcb44cdf1d2876b8
tree1002806a3de8b6808dc833ac6213aaf55d4fb98a
parent51a6ca2c3a65560079d1fbe3a4c1246b5fb19059
parent212ed90615c3d20fa6bd73d70d5153bd0d124e5f
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx