The spat between Nicholas Negroponte and Intel appears to be over.
In a statement Friday, the two parties said that Intel and the One Laptop Per Child project "have agreed to work together to bring the benefits of technology to the developing world through synergy of their respective programs."
Technically, Intel and OLPC will "explore collaborations involving technology and educational content." Intel also becomes an OLPC board member. John Spooner has more.
The agreement puts to rest what was public spat that surfaced on 60 Minutes. Now the two parties can focus on what really matters--getting laptops to the poorest kids.
Not sure what this means for AMD though. Stay tuned.
Also see Michael Dell's comments on OLPC.