From mboxrd@z Thu Jan  1 00:00:00 1970
From: Markus =?iso-8859-1?Q?Klotzb=FCcher?= <mk@denx.de>
Date: Mon, 07 May 2007 16:59:12 +0200
Subject: [U-Boot-Users] USB custodian repostiory updates
In-Reply-To: <20070507132245.9FD93353A05@atlas.denx.de> (Wolfgang Denk's
	message of "Mon, 07 May 2007 15:22:45 +0200")
References: <20070507132245.9FD93353A05@atlas.denx.de>
Message-ID: <87tzuor873.fsf@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Dear Wolfgang,

Wolfgang Denk <wd@denx.de> writes:

> in message <87ps5csu46.fsf@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:

This seems to have been inherited from old testing-usb branch:

http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff;h=d3c5e8b2f5945d93de8f23b053e9dcd033983245

I've moved the old Changelog entry to CHANGELOG-before-U-Boot-1.1.5.

> but you might want to check all other files as well.

I can't see any other. Please try again.

Best regards

Markus Klotzb?cher

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