From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Babic <sbabic@denx.de>
Date: Tue, 22 Nov 2011 08:18:01 +0100
Subject: [U-Boot] [GIT PULL] Pull request: u-boot-staging
In-Reply-To: <CAPnjgZ1grF+19yo6QOej4C-G78MK9JwSXSSc0dS08SAyS=OKiw@mail.gmail.com>
References: <4EC61E4C.8040107@denx.de>
	<20111121211014.523FB1ADFED2@gemini.denx.de>
	<CAPnjgZ1grF+19yo6QOej4C-G78MK9JwSXSSc0dS08SAyS=OKiw@mail.gmail.com>
Message-ID: <4ECB4CA9.9020407@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

On 22/11/2011 06:06, Simon Glass wrote:
> Hi Stefano,
> 

Hi Simon,

>> CONFLICT (content): Merge conflict in lib/hashtable.c
> 
> For this conflict I am sending a V4 patch to the list.

Thanks - I remove in the meantime the two patches that does not apply
anymore (the other one is from Andreas), and I will resubmit the pull
request. I take care of your patch in the next round.

Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================