[U-Boot-Users] please PULL u-boot-usb.git

[Markus Klotzbücher]

Dear Wolfgang,

Wolfgang Denk <wd at denx.de> writes:

> in message <87ps5csu46.fsf at denx.de> you wrote:
>>
>> Please pull from the "master" branch at git://denx.de/git/u-boot-usb.git 
>
> Sorry, but you have unresolved merge problems in your tree: I noticed
> it in the CHANGELOG file:

I've cleaned this up, and failed to find any other conflicts. Please try
again.

Best regards

Markus

--
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office:  Kirchenstr. 5,       D-82194 Groebenzell,            Germany