| commit | 65e61ba52359300c29441e4ace3681d5d9a5be76 | [log] [tgz] |
|---|---|---|
| author | Marc Zyngier <marc.zyngier@arm.com> | Mon Feb 01 10:10:34 2016 +0000 |
| committer | Marc Zyngier <marc.zyngier@arm.com> | Mon Feb 01 10:10:34 2016 +0000 |
| tree | 7b10552d719784b675b95161e2b91cf75ce8fff3 | |
| parent | 020fbc9ed3182b317c350c3ac50b9630227f1bd0 [diff] | |
| parent | d9782a9d2cf0f16c2805633377b0ee540409127f [diff] |
Merge branch 'kvm-arm/wsinc' into kvm-arm64/vhe-wsinc-merge Conflicts: arch/arm/include/asm/virt.h