| commit | a875dafcf9b6b266c855e1f9b0aa060ef585d38a | [log] [tgz] |
|---|---|---|
| author | Christoffer Dall <christoffer.dall@linaro.org> | Thu Sep 18 18:15:32 2014 -0700 |
| committer | Christoffer Dall <christoffer.dall@linaro.org> | Thu Sep 18 18:15:32 2014 -0700 |
| tree | 1903cb0a39ac1cade1940ccb559591cddf3660a0 | |
| parent | 0ba09511ddc3ff0b462f37b4fe4b9c4dccc054ec [diff] | |
| parent | f51770ed465e6eb41da7fa16fd92eb67069600cf [diff] |
Merge remote-tracking branch 'kvm/next' into queue Conflicts: arch/arm64/include/asm/kvm_host.h virt/kvm/arm/vgic.c