Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:19:53 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 25 Aug 2008 18:19:53 +0000 (11:19 -0700)
commit087713f4548e598be64bce28bae36009d41038a4
tree3eb0b464eee846a6f79daf16910cc1d37ddbfa4f
parent7cf0bed9c322992c7d5f912cb9a83d2809e71881
parent1327138e294ffda120a50c8f31d792addb196c79
Merge branch 'kvm-updates-2.6.27' of git://git./linux/kernel/git/avi/kvm

* 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: fix userspace ABI breakage
  KVM: MMU: Fix torn shadow pte
  KVM: Use .fixup instead of .text.fixup on __kvm_handle_fault_on_reboot