Merge branch 'perf'
authorAvi Kivity <avi@redhat.com>
Mon, 19 Apr 2010 09:52:53 +0000 (12:52 +0300)
committerAvi Kivity <avi@redhat.com>
Mon, 17 May 2010 09:17:58 +0000 (12:17 +0300)
commit9beeaa2d689842f7760aa16c512e6bb8182d38b6
tree62cea0772127c4b1c0b476e46dec6830d36809c1
parent3246af0ece6c61689847417977733f0b12dc4b6f
parenta1645ce12adb6c9cc9e19d7695466204e3f017fe
Merge branch 'perf'

Signed-off-by: Avi Kivity <avi@redhat.com>
MAINTAINERS
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c
kernel/sched.c