]> err.no Git - linux-2.6/commit
KVM: x86 emulator: fix merge screwup due to emulator split
authorNitin A Kamble <nitin.a.kamble@intel.com>
Tue, 18 Sep 2007 23:34:25 +0000 (16:34 -0700)
committerAvi Kivity <avi@qumranet.com>
Mon, 22 Oct 2007 10:03:28 +0000 (12:03 +0200)
commit1a52e051368a0e29b26e8790bacd8d1d759e3287
tree738df08e144b317d3a304d6ffca16060b25843f6
parent55b70a0300b873c0ec7ea6e33752af56f41250ce
KVM: x86 emulator: fix merge screwup due to emulator split

This code has gone to wrong place in the file. Moving it back to
right location.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
drivers/kvm/x86_emulate.c