diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-08 15:58:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-08 15:58:14 -0800 |
| commit | 516c50cde604e93f094bb4c42a2cf81411c7a78d (patch) | |
| tree | 06496f37f8db43cb3e7ec2ee5c6606b211b85854 /drivers/fpga/fpga-mgr.c | |
| parent | Merge tag 'pm+acpi-4.4-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | kvm: x86: only channel 0 of the i8254 is linked to the HPET (diff) | |
| download | linux-dev-516c50cde604e93f094bb4c42a2cf81411c7a78d.tar.xz linux-dev-516c50cde604e93f094bb4c42a2cf81411c7a78d.zip | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fix from Paolo Bonzini:
"A simple fix. I'm sending it before the merge window, because it
refines a patch found in your master branch but not yet in the
kvm/next branch that is destined for 4.5"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
kvm: x86: only channel 0 of the i8254 is linked to the HPET
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions