| commit | 5fbb0df6f68e31a586b947433e93ba9654c8080f | [log] [tgz] |
|---|---|---|
| author | Marc Zyngier <marc.zyngier@arm.com> | Mon Mar 19 17:43:01 2018 +0000 |
| committer | Marc Zyngier <marc.zyngier@arm.com> | Mon Mar 19 17:43:01 2018 +0000 |
| tree | 65e68ad352e17318d009e5f69bde535c79b8c3e7 | |
| parent | 4b472ffd1513407ee3607b8e638e8695e9b487ca [diff] | |
| parent | 27e91ad1e746e341ca2312f29bccb9736be7b476 [diff] |
Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD Resolve conflicts with current mainline