From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 19 May 2008 20:53:21 +0000 (-0700)
Subject: Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.26-rc4~122
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=88d53766bd0f3bc6e46a0dff25be147a2b98c511;p=linux-2.6-omap-h63xx.git

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: LAPIC: ignore pending timers if LVTT is disabled
  KVM: Update MAINTAINERS for new mailing lists
  KVM: Fix kvm_vcpu_block() task state race
  KVM: ia64: Set KVM_IOAPIC_NUM_PINS to 48
  KVM: ia64: fix GVMM module including position-dependent objects
  KVM: ia64: Define new kvm_fpreg struture to replace ia64_fpreg
  KVM: PIT: take inject_pending into account when emulating hlt
  s390: KVM guest: fix compile error
  KVM: x86 emulator: fix writes to registers with modrm encodings
---

88d53766bd0f3bc6e46a0dff25be147a2b98c511