Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:57:05 +0000 (23:57 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:57:05 +0000 (23:57 +0100)
commit072f4125f1df8e9a25b3d8f4298b000183763cf4
tree2cb6f505002b0dafd225504ccaf34c0552483ad7
parent83e5c1c1e1ab29a5b84807bbf7f5dc0561ec83d8
parentc7b7d4550d0178dc302c808f974a7beb0f80d3e1
Merge branch 'master' of git://git.denx.de/u-boot-ubi