Backport additional CPU options for 3.2 kernels
Merge pull request #3 from bircoph/master

Backport additional CPU options for 3.2 kernels