[U-Boot-Users] [PATCH] Fix my own merge stupidity

Wolfgang Denk wd at denx.de
Wed Jan 9 23:13:16 CET 2008


In message <11999082921387-git-send-email-afleming at freescale.com> you wrote:
> Way back in August I merged Heiko's patch:
> 566a494f592: [PCS440EP] upgrade the PCS440EP board
> 
> with Jon's CONFIG_COMMANDS patches.
> 
> This was done in commit: 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78
> 
> However, in the process, I left out some of Heiko's good changes.
> 
> Now Heiko's and Jon's patches are properly merged in fat_register_device()
> 
> Signed-off-by: Andy Fleming <afleming at freescale.com>

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
I can't understand it. I can't even understand  the  people  who  can
understand it.                    - Queen Juliana of the Netherlands.




More information about the U-Boot mailing list