Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Browse source

* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Fix reboot on Intel hosts
  KVM: fix irqfd assign/deassign race

...

This commit is contained in:

Linus Torvalds 2010-09-23 17:13:17 -07:00

parent 91e71c12c5 ca242ac996

commit bcf835e52e

2 changed files with 5 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

virt/kvm/eventfd.c

View file

4

virt/kvm/kvm_main.c

View file