Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git] / arch / x86 / include / asm / kvm_para.h
Simple merge