Merge branch 'master' of git://git.denx.de/u-boot-marvell
authorWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:37:27 +0000 (22:37 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 10 Aug 2010 20:37:27 +0000 (22:37 +0200)
commitfe8d63c8c75acc87d398b2e181b9135d2ecfc05a
tree4eec2967c157e11cbf54f41845fb1350d3cc772f
parent9844d027b52cc89264f6bf7686e26d9dc50134fd
parent86cf2ae492db316e73512a1786d57ece9b3a7624
Merge branch 'master' of git://git.denx.de/u-boot-marvell