diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-06 14:16:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-06 14:16:23 -0400 |
commit | 1b40a895df6c7d5a80e71f65674060b03d84bbef (patch) | |
tree | cf79bd75779139d4fe5b247f909eb8974f1d9117 /fs/proc/proc_misc.c | |
parent | 97f8571e663c808ad2d01a396627235167291556 (diff) | |
parent | 35baff256d8fe1eec0b8988fcb5cde80df7bfa1a (diff) |
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: IOAPIC: Fix level-triggered irq injection hang
x86: KVM guest: Add memory clobber to hypercalls
Diffstat (limited to 'fs/proc/proc_misc.c')
0 files changed, 0 insertions, 0 deletions