[U-Boot] [GIT PULL] Pull request: u-boot-staging

Stefano Babic
2011-11-22T07:18:01Z

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
=====================================================================