tree cf79bd75779139d4fe5b247f909eb8974f1d9117
parent 97f8571e663c808ad2d01a396627235167291556
parent 35baff256d8fe1eec0b8988fcb5cde80df7bfa1a
author Linus Torvalds <torvalds@linux-foundation.org> 1215368183 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215368183 -0700

Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

* 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
  KVM: IOAPIC: Fix level-triggered irq injection hang
  x86: KVM guest: Add memory clobber to hypercalls