Merging companies like HP and Dell if not going to help.
There needs to be more competition and innovation, form factors are changing.
5-10 years ago if you wanted something portable you got a laptop period. there was nothing else, unless you wanted some rediclous Windows mobile or Palm, PDA/early smartphone type thing...but they basically just sucked, mobiel connectsions were to expensive and slow, betteries either sucked or were massive...
Now there are smartphones, tablets, phablets, hybrid laptops, ultrabooks, laptops, AIO, thin clients/virtual desktops and the good old desktop, I'm sure there is someone in the world using a Pi as their main PC! (and that's probably half the list)
The PC (desktop and laptop) market will continue to shrink, nothing can be done about that. what companies like HP Dell Acer Lenovo etc... have to do is embrace that and create new and more innovative form factors that we want to use as consumers.
This is starting, companies are realising it, HP changed the name of the PC division to Personal Systems and is now bringing out tablets and hybrids, (rumours are a phone soon), but most are struggling to outdo the ipad/android tablets for personal use, and Windows 8 is yet to capture the market. As much as the enterprise market will remain much the same level, if personal customers change form factors then the market is going to shift.