Merge branch into tip/master: 'x86/vmware'

* x86/vmware:
    4745ca43104b x86/vmware: Use BIT() macro for shifting

Signed-off-by: Ingo Molnar <mingo@kernel.org>