diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-07 19:06:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-07 19:06:28 -0700 |
commit | 58a9a36b5444cbd921cdfc8ddd344d9983cc2c7b (patch) | |
tree | d844cc89a89f0802104326eeafbfcb37eb9263a4 /drivers/net/ariadne.h | |
parent | 22b174f8b7daf59f01b7b76e95c14edf41bf45fa (diff) | |
parent | 74b5c5bfff429f464c38dd49af41d75cf0e7dc26 (diff) |
Merge branch 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/3.0' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Initialize kvm before registering the mmu notifier
KVM: x86: use proper port value when checking io instruction permission
KVM: add missing void __user * cast to access_ok() call
Diffstat (limited to 'drivers/net/ariadne.h')
0 files changed, 0 insertions, 0 deletions