Intel and the not-for-profit organisation behind the $100 laptop project, the One Laptop per Child (OLPC) foundation have resolved their differences and joined forces.
The new agreement will see Intel working with the OLPC to further its drive to see each and every child in developing countries receive a laptop to aid their learning.
The move comes after Nicholas Negroponte's recent comments about the chipmaker. The MIT professor behind the One Laptop per Child initiative had said that Intel was dumping products on the same markets that it was targeting, all because the XO laptop used AMD processors.
"What happened in the past has happened," said Will Swope of Intel, speaking to BBC News. "But going forward, this allows the two organisations to go do a better job and have a better impact for what we are both very eager to do, which is help kids around the world."
Speaking to the BBC, Negroponte said: "Intel joins the OLPC board as a world leader in technology, helping reach the world's children. Collaboration with Intel means that the maximum number of laptops will reach children."
The move however will not see AMD's processors removed from the XO laptop. Instead, Intel's involvement is likely to come from the provision of servers and software that it initially developed for the XO's former Intel-built rival Classmate PC.