[U-Boot-Users] [PATCH] PHY: Add support for the M88E1121R Marvell chip.

Wolfgang Denk
2008-06-09T06:09:08Z

Dear Ben,

in message <484CBB58.90903@qstreams.com> you wrote:
>
> This won't apply because to the net repo, I'm guessing because I've
> already applied another patch to driver/net/tsec.c for another Marvell
> PHY (commit 290ef6436838b1cc013bd67e0e0495c9eb3e23c0) and it hasn't made
> it into the main line yet. I see two options:
>
> 1. Somebody who knows more about git please tell me how to merge this.
> 2. Rebase the patch vs. the current net tree.

If you agree with the content of the patch, then please just ACK it.
I will then first pull the net repo, and after this merge with the
"socrates" branch I have here. I will also resolve the resulting
merge conflicts, if any. OK?

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
In the beginning, there was nothing, which exploded.
- Terry Pratchett, _Lords and Ladies_