Am 29/04/2012 20:24, schrieb Eric Nelson:
> On 04/29/2012 07:59 AM, Stefano Babic wrote:
>> On 26/04/2012 02:14, Eric Nelson wrote:
>>> Uses the 'magic_keys' idiom as described in doc/README.kbd:
>>>     http://lists.denx.de/pipermail/u-boot/2012-April/122502.html
>>>
>>> Signed-off-by: Eric Nelson<eric.nel...@boundarydevices.com>
>>> Acked-by: Marek Vasut<ma...@denx.de>
>>> ---
>>
>> Applied after rebasing on current u-boot-imx, thanks.
>>
> Thanks Stefano,
> 
> I'm never quite sure whether I should submit patches against u-boot-imx
> or the mainline head.

Of course it should be enough to submit patches against mainline - only
in the time approaching the release (as it was for your patch) I have
the problem I must postpone patches for the next release, putting them
on the -next branch, and then some rebasing is needed.

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: off...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to