| commit | 05fc265939403d2a0789cd071de9f26152842309 | [log] [tgz] |
|---|---|---|
| author | Christoffer Dall <christoffer.dall@linaro.org> | Wed Oct 08 11:20:51 2014 +0200 |
| committer | Christoffer Dall <christoffer.dall@linaro.org> | Wed Oct 08 11:20:51 2014 +0200 |
| tree | 3eff409451740ce6d7a5ab3d250d9928cb0bcc58 | |
| parent | 3143b4aaa5182e7a7d0bfb51d03bd6216d6bfd53 [diff] | |
| parent | d731c6c9b17b8a6b471981b3e310235049190034 [diff] |
Merge branch 'lsk/v3.14/topic/kvm' into lsk/lsk-with-kvm-v3.14 Conflicts: arch/arm64/include/asm/debug-monitors.h