diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-04 15:24:17 (GMT) |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-11-04 15:24:17 (GMT) |
| commit | 197a4f4b063e4e7a603ff1de56b3cf0400fabc30 (patch) | |
| tree | 36a3d057cec3aff49cf2fe9df3e63218595dd68b /drivers/Makefile | |
| parent | d6cf98e06ea4c4071596bc28f2a0f21412d5c6dc (diff) | |
| parent | 26caea7693cb99833fe4ecc544c842289d6b3f69 (diff) | |
| download | linux-197a4f4b063e4e7a603ff1de56b3cf0400fabc30.tar.xz | |
Merge tag 'kvm-arm-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for v4.4-rc1
Includes a number of fixes for the arch-timer, introducing proper
level-triggered semantics for the arch-timers, a series of patches to
synchronously halt a guest (prerequisite for IRQ forwarding), some tracepoint
improvements, a tweak for the EL2 panic handlers, some more VGIC cleanups
getting rid of redundant state, and finally a stylistic change that gets rid of
some ctags warnings.
Conflicts:
arch/x86/include/asm/kvm_host.h
Diffstat (limited to 'drivers/Makefile')
0 files changed, 0 insertions, 0 deletions