diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-10 20:45:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-11 00:34:43 +0100 |
| commit | 1ab056a5fb0d123436b862806734c6a9dc4651a4 (patch) | |
| tree | 507968eeb2f51528b9a5d728523157702f4feaf3 /virt/kvm/ioapic.c | |
| parent | 71b9f09697fc2ebacbc9e52079f2c6156f9b994f (diff) | |
| parent | b97ae0d6eac52b4fda9f0dd1d31c81dac4ddd572 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/gicv3' into linux-linaro-lsk
Conflicts:
drivers/irqchip/irq-gic.c
include/linux/irqchip/arm-gic.h
Diffstat (limited to 'virt/kvm/ioapic.c')
0 files changed, 0 insertions, 0 deletions