| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 | [log] [tgz] |
|---|---|---|
| author | Gleb Natapov <gleb@redhat.com> | Thu Oct 17 17:04:47 2013 +0300 |
| committer | Gleb Natapov <gleb@redhat.com> | Thu Oct 17 17:41:49 2013 +0300 |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa [diff] | |
| parent | 34ec4de42be5006abdd8d0c08b306ffaa64d0d5d [diff] |
Powerpc KVM work is based on a commit after rc4. Merging master into next to satisfy the dependencies. Conflicts: arch/arm/kvm/reset.c