Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Jul 2008 18:16:23 +0000 (11:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Jul 2008 18:16:23 +0000 (11:16 -0700)
commit1b40a895df6c7d5a80e71f65674060b03d84bbef
treecf79bd75779139d4fe5b247f909eb8974f1d9117
parent97f8571e663c808ad2d01a396627235167291556
parent35baff256d8fe1eec0b8988fcb5cde80df7bfa1a
Merge branch 'kvm-updates-2.6.26' of git://git./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