Merge remote-tracking branch 'kvm/kvm-updates/3.2'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64s.S
Simple merge

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc virt/kvm/assigned-dev.c
Simple merge