Merge branch 'perf'

Signed-off-by: Avi Kivity <avi@redhat.com>

diff --cc MAINTAINERS
Simple merge

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

diff --cc arch/x86/kvm/x86.c
index 30efeead4511f6bda8b8f4466bbe76cb14d39333,c3a33b2bb169733b822692437f36c590637eab12..58a96e6a234cdae8c2ac9744eb4028087f3fcd10
--- 1/arch/x86/kvm/x86.c
--- 2/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -40,8 -40,9 +40,9 @@@
  #include <linux/user-return-notifier.h>
  #include <linux/srcu.h>
  #include <linux/slab.h>
+ #include <linux/perf_event.h>
  #include <trace/events/kvm.h>
 -#undef TRACE_INCLUDE_FILE
 +
  #define CREATE_TRACE_POINTS
  #include "trace.h"
  

diff --cc kernel/sched.c
Simple merge