Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Mon, 17 May 2010 21:11:21 +0000 (23:11 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 17 May 2010 21:11:21 +0000 (23:11 +0200)
commit1a1e6bf12b3155f47d2661793ceee3daded0d937
tree9e1b80ccd824be1c6884a0af31a76c79bf4c7c54
parenta2a0a7171303de5d8ce099344efde2e29ee36eb0
parentbcb6c2bb84705bfd73eed5c9a31e9ff24833ee8c
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx