]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8f46c50 09a6e1f)
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2013 19:57:30 +0000 (12:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2013 19:57:30 +0000 (12:57 -0700)
commitb9cb3bf42efc2faa55e815f4368738978536c6d1
treed17b9aa7132313423d9c1d53695bbeead35fa00etree
parent8f46c507a2245697d6b3af75552c76d2f4fb3ed2commit | diff
parent09a6e1f4ad32243989b30485f78985c0923284cdcommit | diff
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM fix from Marcelo Tosatti:
 "Fix compilation on PPC with !CONFIG_KVM"

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  Revert "KVM: allow host header to be included even for !CONFIG_KVM"
Ubuntu Disco kernel mirror for Proxmox VE and PMG