Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
commit7223b915421716b4e57ffb7e13f41f1b926db55c
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Apr 2010 01:44:29 +0000 (14 18:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Apr 2010 01:44:29 +0000 (14 18:44 -0700)
tree2c5fb902eb2986c84ee8f0f1988cc3d63b9d0107
parentd471a4b9f2ac327c15300ba2b2bda2c6d6fd03bc
parent091ebf07a2408f9a56634caa0f86d9360e9af23b
Merge git://git./linux/kernel/git/rusty/linux-2.6-for-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  lguest: stop using KVM hypercall mechanism
  lguest: workaround cmpxchg8b_emu by ignoring cli in the guest.