It's not that competition among hardware and software vendors has come to an end, but in some cases the value of cooperation and interoperability seems to have won out. This is certainly the case for the new Microsoft, which has embraced all platforms, from offering Office products for iPhone and iPad to providing top drawer cloud hosting for Linux.
Hardware manufacturers are spreading their bets across multiple software platforms as well. The market for tablets becomes more diverse each year, and the line between tablets, phones, notebooks and laptops has been blurred as phones grow, notebooks sport removable keyboards, and tablets take on the power of desktops.
Perhaps we are on the verge of a peace dividend for all technology consumers.