In response to Ian, here's my guess, in the style of Conan O'Brien's 'In the Year 2000'.
Altadis owns majority stake in Habanos S.A., so they'll just release the brands they own the US trademarks for. General will put up a tough legal fight, and at least get a huge payoff. Or HSA will release the same cigars under new brand names. The little guys that still own a US trademark for a Cuban brand (The Quesadas owning Fonseca, the Padrons owning Jose L. Piedra I believe, Ashton and the San Cristobal brand) will put up fights for as long as there is money in it, but eventually will either cut a deal that includes shares of Altadis or cash, or Habanos will put out a 'new brand' with a wink, that is just like the disputed brand. There will be a boom for Cuban cigars as even many non-smokers will go out and try the formerly forbidden fruit, and quality will go in the toilet as production skyrockets to meet demand. It will be rough times for many of the smaller NC brands, and many will simply go out of business. Other than perhaps San Cristobal, I can't think of anyone other than General that Altadis would really care about. Fonseca and Jose L Piedra as brand names just aren't worth the legal fight.