Merge commit 'v3.5' into kvmtool/next

Michael Ellerman writes:

  It occurred to me overnight that I forgot to mention that in order to
  build the new code you need the headers from a 3.5-rc1 era kernel (for
  the ioctl & KVM_CAP definitions).

  The easiest way to do that is to merge linus' tree into kvmtool.

Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge