Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Tue, 5 Apr 2011 10:17:38 +0000 (12:17 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 5 Apr 2011 10:17:38 +0000 (12:17 +0200)
commit75df0d594990875419121c6f8687472ac9f4ae7a
tree9809f028b16c945f1c6f261ad5a08c3eb0e338e2
parent0a5f7e1bdcf16e11fb8407436a9e1eb5d935d342
parentea2f0cb35cb488f27b3f1625396e874fcbf309e0
Merge branch 'master' of git://git.denx.de/u-boot-mips