diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 21:09:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 21:09:07 +0200 |
| commit | bd0e162d0312aa95e8b85ba883efddebf27be121 (patch) | |
| tree | 5401fd64650a2c5965e43dccaa636bc814072043 /include/media/v4l2-device.h | |
| parent | Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (diff) | |
| parent | KVM: Export asm-generic/kvm_para.h (diff) | |
| download | linux-bd0e162d0312aa95e8b85ba883efddebf27be121.tar.xz linux-bd0e162d0312aa95e8b85ba883efddebf27be121.zip | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull two small kvm fixes from Avi Kivity:
"A build fix for non-kvm archs and a transparent hugepage refcount
bugfix on hosts with 4M pages."
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Export asm-generic/kvm_para.h
KVM: MMU: fix huge page adapted on non-PAE host
Diffstat (limited to 'include/media/v4l2-device.h')
0 files changed, 0 insertions, 0 deletions