Amazon and book publisher Macmillan ended a dispute over e-book pricing with the Kindle maker conceding defeat in a skirmish that could ultimately jack-up the price of e-books.