Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits)
  KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
  KVM: VMX: Update instruction length on intercepted BP
  KVM: Fix emulate_sys[call, enter, exit]()'s fault handling
  KVM: Fix segment descriptor loading
  KVM: Fix load_guest_segment_descriptor() to inject page fault
  KVM: x86 emulator: Forbid modifying CS segment register by mov instruction
  KVM: Convert kvm->requests_lock to raw_spinlock_t
  KVM: Convert i8254/i8259 locks to raw_spinlocks
  KVM: x86 emulator: disallow opcode 82 in 64-bit mode
  KVM: x86 emulator: code style cleanup
  KVM: Plan obsolescence of kernel allocated slots, paravirt mmu
  KVM: x86 emulator: Add LOCK prefix validity checking
  KVM: x86 emulator: Check CPL level during privilege instruction emulation
  KVM: x86 emulator: Fix popf emulation
  KVM: x86 emulator: Check IOPL level during io instruction emulation
  KVM: x86 emulator: fix memory access during x86 emulation
  KVM: x86 emulator: Add Virtual-8086 mode of emulation
  KVM: x86 emulator: Add group9 instruction decoding
  KVM: x86 emulator: Add group8 instruction decoding
  KVM: do not store wqh in irqfd
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index 03497909539e7859d460b131c46c6e853af5e48a,db205276bb538be38f5722274fac64bc8b2571bf..31575e220f3ba9da40526301ff502d85850768ff
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -526,33 -541,30 +526,65 @@@ Who:    Hans de Goede <hdegoede@redhat.com
  
  ----------------------------
  
 +What: corgikbd, spitzkbd, tosakbd driver
 +When: 2.6.35
 +Files:        drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
 +Why:  We now have a generic GPIO based matrix keyboard driver that
 +      are fully capable of handling all the keys on these devices.
 +      The original drivers manipulate the GPIO registers directly
 +      and so are difficult to maintain.
 +Who:  Eric Miao <eric.y.miao@gmail.com>
 +
 +----------------------------
 +
 +What: corgi_ssp and corgi_ts driver
 +When: 2.6.35
 +Files:        arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c
 +Why:  The corgi touchscreen is now deprecated in favour of the generic
 +      ads7846.c driver. The noise reduction technique used in corgi_ts.c,
 +      that's to wait till vsync before ADC sampling, is also integrated into
 +      ads7846 driver now. Provided that the original driver is not generic
 +      and is difficult to maintain, it will be removed later.
 +Who:  Eric Miao <eric.y.miao@gmail.com>
 +
 +----------------------------
 +
 +What: capifs
 +When: February 2011
 +Files:        drivers/isdn/capi/capifs.*
 +Why:  udev fully replaces this special file system that only contains CAPI
 +      NCCI TTY device nodes. User space (pppdcapiplugin) works without
 +      noticing the difference.
 +Who:  Jan Kiszka <jan.kiszka@web.de>
++
++----------------------------
++
+ What: KVM memory aliases support
+ When: July 2010
+ Why:  Memory aliasing support is used for speeding up guest vga access
+       through the vga windows.
+ 
+       Modern userspace no longer uses this feature, so it's just bitrotted
+       code and can be removed with no impact.
+ Who:  Avi Kivity <avi@redhat.com>
+ 
+ ----------------------------
+ 
+ What: KVM kernel-allocated memory slots
+ When: July 2010
+ Why:  Since 2.6.25, kvm supports user-allocated memory slots, which are
+       much more flexible than kernel-allocated slots.  All current userspace
+       supports the newer interface and this code can be removed with no
+       impact.
+ Who:  Avi Kivity <avi@redhat.com>
+ 
+ ----------------------------
+ 
+ What: KVM paravirt mmu host support
+ When: January 2011
+ Why:  The paravirt mmu host support is slower than non-paravirt mmu, both
+       on newer and older hardware.  It is already not exposed to the guest,
+       and kept only for live migration purposes.
+ Who:  Avi Kivity <avi@redhat.com>
++
++----------------------------

diff --cc MAINTAINERS
Simple merge

diff --cc arch/ia64/kvm/Kconfig
Simple merge

diff --cc arch/powerpc/kvm/Kconfig
Simple merge

diff --cc arch/x86/kvm/Kconfig
Simple merge