[APPLIED] Maverick pull request, drop preempt flavour, remove sub-flavors, add virtual flavour

[Leann Ogasawara]

Applied to Maverick master with some twiddling to the bits that touched
the 2.6.34-2.9 ABI to instead affect the 2.6.34-3.10 ABI since I did a
start new release before pulling in these changes.

Thanks,
Leann